cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 03:25:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

-Softcaps can now be dyed in washing machines. Thanks to Intigracy for the sprite work

Browse Source 
-Merged cargo maintenance /area/ into mining dock (It was so small and pointless)
-A few aesthetic changes to the map

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3972 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
ericgfwong@hotmail.com
2012-07-03 02:20:42 +00:00
parent 30348f24c4
commit 9e8f39683f
9 changed files with 7453 additions and 7362 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/closets/secure/cargo.dm
+2
View File
@@ -15,6 +15,7 @@
new /obj/item/clothing/shoes/black(src)
new /obj/item/device/radio/headset/headset_cargo(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/head/soft(src)
// new /obj/item/weapon/cartridge/quartermaster(src)
return
@@ -40,4 +41,5 @@
new /obj/item/weapon/tank/emergency_oxygen(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/glasses/meson(src)
new /obj/item/clothing/head/soft(src)
return
code/game/objects/closets/wardrobe.dm
+4 -4
View File
@@ -16,10 +16,10 @@
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/shoes/jackboots(src)
new /obj/item/clothing/head/secsoft(src)
new /obj/item/clothing/head/secsoft(src)
new /obj/item/clothing/head/secsoft(src)
new /obj/item/clothing/head/secsoft(src)
new /obj/item/clothing/head/soft/sec(src)
new /obj/item/clothing/head/soft/sec(src)
new /obj/item/clothing/head/soft/sec(src)
new /obj/item/clothing/head/soft/sec(src)
return
/obj/structure/closet/wardrobe/pink/New()
code/game/objects/washing_machine.dm
+19
View File
@@ -67,6 +67,8 @@
var/new_shoe_name = ""
var/new_sheet_icon_state = ""
var/new_sheet_name = ""
var/new_softcap_icon_state = ""
var/new_softcap_name = ""
var/new_desc = "The colors are a bit dodgy."
for(var/T in typesof(/obj/item/clothing/under))
var/obj/item/clothing/under/J = new T
@@ -110,6 +112,16 @@
//world << "DEBUG: YUP! [new_icon_state] and [new_item_state]"
break
del(B)
for(var/T in typesof(/obj/item/clothing/head/soft))
var/obj/item/clothing/head/soft/H = new T
//world << "DEBUG: [color] == [J.color]"
if(color == H.color)
new_softcap_icon_state = H.icon_state
new_softcap_name = H.name
del(H)
//world << "DEBUG: YUP! [new_icon_state] and [new_item_state]"
break
del(H)
if(new_jumpsuit_icon_state && new_jumpsuit_item_state && new_jumpsuit_name)
for(var/obj/item/clothing/under/J in contents)
//world << "DEBUG: YUP! FOUND IT!"
@@ -140,6 +152,13 @@
B.color = color
B.name = new_sheet_name
B.desc = new_desc
if(new_softcap_icon_state && new_softcap_name)
for(var/obj/item/clothing/head/soft/H in contents)
//world << "DEBUG: YUP! FOUND IT!"
H.icon_state = new_softcap_icon_state
H.color = color
H.name = new_softcap_name
H.desc = new_desc
del(crayon)
crayon = null