Skip to content

Commit

Permalink
Враги Буянова берегитесь
Browse files Browse the repository at this point in the history
  • Loading branch information
LordNest committed Dec 29, 2023
1 parent e70a8d2 commit 0edc460
Show file tree
Hide file tree
Showing 5 changed files with 109 additions and 13 deletions.
18 changes: 17 additions & 1 deletion maps/sierra/datums/supplypacks/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@

/singleton/hierarchy/supply_pack/security/armory/pdw
name = "Weapons - Ballistic NT41"
contains = list(/obj/item/gun/projectile/automatic = 2)
contains = list(/obj/item/gun/projectile/automatic/nt41 = 2)
cost = 60
containername = "\improper Ballistic PDW crate"
security_level = SUPPLY_SECURITY_HIGH
Expand Down Expand Up @@ -124,3 +124,19 @@
containername = "pistol ammunition crate"
access = access_security
security_level = SUPPLY_SECURITY_ELEVATED

/singleton/hierarchy/supply_pack/security/tacticalarmor
name = "Armor - Tactical"
contains = list(/obj/item/clothing/under/tactical,
/obj/item/clothing/suit/armor/pcarrier/tan/tactical,
/obj/item/clothing/head/helmet/tactical,
/obj/item/clothing/mask/balaclava/tactical,
/obj/item/clothing/glasses/tacgoggles,
/obj/item/storage/belt/holster/security/tactical,
/obj/item/clothing/shoes/tactical,
/obj/item/clothing/gloves/tactical)
cost = 45
containertype = /obj/structure/closet/crate/secure
containername = "tactical armor crate"
access = access_armory
security_level = SUPPLY_SECURITY_ELEVATED
18 changes: 7 additions & 11 deletions mods/_maps/liberia/maps/liberia.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,8 @@
/obj/item/clothing/mask/balaclava,
/obj/item/clothing/glasses/tacgoggles,
/obj/item/clothing/under/syndicate,
/obj/item/clothing/gloves/insulated/black,
/obj/item/clothing/suit/armor/pcarrier/tactical,
/turf/simulated/floor/tiled/dark/monotile,
/area/liberia/mule)
"bt" = (
Expand Down Expand Up @@ -2013,6 +2015,7 @@
/obj/machinery/alarm/merchant{
pixel_y = 24
},
/obj/structure/closet/secure_closet/engineering_electrical/bearcat,
/turf/simulated/floor/tiled/techfloor/grid,
/area/liberia/engineeringreactor)
"dx" = (
Expand Down Expand Up @@ -7522,7 +7525,7 @@
dir = 8
},
/obj/structure/disposalpipe/trunk{
dir = 4
dir = 1
},
/obj/machinery/shield_diffuser,
/turf/simulated/floor/reinforced{
Expand Down Expand Up @@ -9000,13 +9003,6 @@
},
/turf/simulated/floor/tiled,
/area/liberia/hallway)
"Xw" = (
/obj/structure/disposalpipe/segment{
dir = 8;
icon_state = "pipe-c"
},
/turf/simulated/wall/r_wall/prepainted,
/area/liberia/captain)
"XE" = (
/obj/floor_decal/borderfloor/corner{
dir = 4
Expand Down Expand Up @@ -25412,7 +25408,7 @@ ZO
oM
pS
VX
Sm
nO
ya
aa
aa
Expand Down Expand Up @@ -25614,8 +25610,8 @@ ZO
oM
pS
VX
nO
Xw
Fc
Aa
WS
WS
WS
Expand Down
Binary file modified nano/images/sierra/sierra-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
84 changes: 84 additions & 0 deletions nano/templates/mods/crushercontrol.tmpl
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<h3>Crusher Management</h3>
{{if data.piston_count == 0}}
<div class="item">
<div class="itemLabel">
Intialize Crusher:
</div>
<div class="itemContent">
{{:helper.link('Initialize', 'refresh', { 'initialize' : '1' })}}
</div>
</div>
{{/if}}
{{if data.airlock_count > 0}}
<div>
<div class="itemLabel">
Airlock Control:
</div>
<div class="itemContent">
{{:helper.link('Open', 'refresh', { 'hatch_open' : '1' })}}
{{:helper.link('Close', 'refresh', { 'hatch_close' : '1' })}}
</div>
</div>
{{/if}}
{{if data.piston_count > 0}}
<div>
<div class="itemLabel">
Activate:
</div>
<div class="itemContent">
{{if data.extending == 1}}
{{:helper.link('Start', 'alert', { 'crush' : '1' }, 'active')}}
{{:helper.link('Abort', 'alert', { 'abort' : '1' })}}
{{else}}
{{:helper.link('Start', 'alert', { 'crush' : '1' })}}
{{:helper.link('Abort', 'alert', { 'abort' : '1' }, 'disabled')}}
{{/if}}
</div>
</div>
{{/if}}

<h3>Crusher Monitoring</h3>
<div>
<div class="itemLabel">
Linked Pistons:
</div>
<div class="itemContent">
{{:data.piston_count}}
</div>
</div>
{{if data.piston_count > 0}}
<table>
{{for data.status_pistons}}
<tr>
<td>Piston {{:value.piston}}</td>
{{if value.blocked == 0}}
{{if value.action == "extend"}}
<td>{{:helper.displayBar(value.progress, 0, 100, 'good')}}</td>
{{else}}
<td>{{:helper.displayBar(value.progress, 0, 100, 'average')}}</td>
{{/if}}
{{else}}
<td>{{:helper.displayBar(value.progress, 0, 100, 'bad')}}</td>
{{/if}}
</tr>
{{/for}}
</table>
{{/if}}
<div>
<div class="itemLabel">
Linked Airlocks:
</div>
<div class="itemContent">
{{:data.airlock_count}}
</div>
</div>
{{if data.message }}
<div>
<div class="itemLabel">
Message:
</div>
<div class="itemContent">
{{:data.message}}{{:helper.link('', 'close', { 'close' : '1' })}}
</div>
</div>
{{/if}}
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
data["extending"] = extending
ui = SSnano.try_update_ui(user, src, ui_key, ui, data, force_open)
if (!ui)
ui = new(user, src, ui_key, "mod_scrap_compactor_crushercontrol.tmpl", name, 500, 350, state = state)
ui = new(user, src, ui_key, "mods-crushercontrol.tmpl", name, 500, 350, state = state)
ui.auto_update_layout = 1
ui.set_initial_data(data)
ui.open()
Expand Down

0 comments on commit 0edc460

Please sign in to comment.