cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-27 14:07:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #209 from Fox-McCloud/Odds-and-Ends

Browse Source 
Odds and ends
This commit is contained in:
Fox-McCloud
2015-01-23 22:19:57 -05:00
parent 26f19f27c7 1a395dce03
commit 7dced99c6f
16 changed files with 161 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/cryo.dm
+12 -7
View File
@@ -35,7 +35,7 @@
component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
component_parts += new /obj/item/stack/cable_coil(src, 1)
RefreshParts()
/obj/machinery/atmospherics/unary/cryo_cell/New()
..()
component_parts = list()
@@ -53,7 +53,7 @@
for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
C += M.rating
current_heat_capacity = 50 * C
efficiency = C
efficiency = C
/obj/machinery/atmospherics/unary/cryo_cell/initialize()
if(node) return
@@ -115,6 +115,11 @@
/obj/machinery/atmospherics/unary/cryo_cell/process()
..()
if(occupant)
if(occupant.health >= 100)
on = 0
go_out()
playsound(src.loc, 'sound/machines/ding.ogg', 50, 1)
if(!node)
return
if(!on)
@@ -153,7 +158,7 @@
return
ui_interact(user)
/**
* The ui_interact proc is used to open and update Nano UIs
@@ -268,15 +273,15 @@
if (istype(G, /obj/item/weapon/screwdriver))
if(occupant || on)
user << "<span class='notice'>The maintenance panel is locked.</span>"
return
return
default_deconstruction_screwdriver(user, "cell-o", "cell-off", G)
return
return
if(exchange_parts(user, G))
return
default_deconstruction_crowbar(G)
if(istype(G, /obj/item/weapon/grab))
if(panel_open)
user << "\blue <b>Close the maintenance panel first.</b>"
code/game/machinery/vending.dm
+3 -2
View File
@@ -1105,8 +1105,9 @@
/obj/item/clothing/under/sundress=2,/obj/item/clothing/under/stripeddress = 1, /obj/item/clothing/under/sailordress = 1, /obj/item/clothing/under/redeveninggown = 1, /obj/item/clothing/under/blacktango=1,/obj/item/clothing/suit/jacket=3,
/obj/item/clothing/glasses/regular=2,/obj/item/clothing/head/sombrero=1,/obj/item/clothing/suit/poncho=1,
/obj/item/clothing/suit/ianshirt=1,/obj/item/clothing/shoes/laceup=2,/obj/item/clothing/shoes/black=4,
/obj/item/clothing/shoes/sandal=1)
contraband = list(/obj/item/clothing/under/syndicate/tacticool=1,/obj/item/clothing/mask/balaclava=1,/obj/item/clothing/head/ushanka=1,/obj/item/clothing/under/soviet=1)
/obj/item/clothing/shoes/sandal=1,
/obj/item/weapon/storage/belt/fannypack=1, /obj/item/weapon/storage/belt/fannypack/blue=1, /obj/item/weapon/storage/belt/fannypack/red=1)
contraband = list(/obj/item/clothing/under/syndicate/tacticool=1,/obj/item/clothing/mask/balaclava=1,/obj/item/clothing/head/ushanka=1,/obj/item/clothing/under/soviet=1,/obj/item/weapon/storage/belt/fannypack/black=1)
premium = list(/obj/item/clothing/under/suit_jacket/checkered=1,/obj/item/clothing/head/mailman=1,/obj/item/clothing/under/rank/mailman=1,/obj/item/clothing/suit/jacket/leather=1,/obj/item/clothing/under/pants/mustangjeans=1)
refill_canister = /obj/item/weapon/vending_refill/clothing