cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3063 from VOREStation/aro-boxes

Browse Source 
Boxes + Air Pumps + Intercoms
This commit is contained in:
Aronai Sieyes
2018-02-18 20:35:07 -05:00
committed by GitHub
parent 4850e50ad2 c29202acdc
commit ee022c1f79
26 changed files with 1130 additions and 1182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/masks/breath.dm
+14
View File
@@ -45,3 +45,17 @@
icon_state = "medical"
item_state_slots = list(slot_r_hand_str = "medical", slot_l_hand_str = "medical")
permeability_coefficient = 0.01
/obj/item/clothing/mask/breath/emergency
desc = "A close-fitting mask that is used by the wallmounted emergency oxygen pump."
name = "emergency mask"
icon_state = "breath"
item_state = "breath"
permeability_coefficient = 0.50
/obj/item/clothing/mask/breath/anesthetic
desc = "A close-fitting sterile mask that is used by the anesthetic wallmounted pump."
name = "anesthetic mask"
icon_state = "medical"
item_state = "medical"
permeability_coefficient = 0.01
code/modules/power/cable.dm
+6
View File
@@ -882,6 +882,12 @@ obj/structure/cable/proc/cableColor(var/colorC)
color = pick(COLOR_RED, COLOR_BLUE, COLOR_LIME, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN, COLOR_SILVER, COLOR_GRAY, COLOR_BLACK, COLOR_MAROON, COLOR_OLIVE, COLOR_LIME, COLOR_TEAL, COLOR_NAVY, COLOR_PURPLE, COLOR_BEIGE, COLOR_BROWN)
..()
/obj/item/stack/cable_coil/random_belt/New()
stacktype = /obj/item/stack/cable_coil
color = pick(COLOR_RED, COLOR_YELLOW, COLOR_ORANGE)
amount = 30
..()
//Endless alien cable coil
/obj/item/stack/cable_coil/alien