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

- You can now recolor jumpsuits, shoes, gloves and bedsheets using the washing machine.

Browse Source 
Screenshot: http://www.kamletos.si/laundry.png
- Some religions (currently Islam, Scientology and Atheism) set your chapel's symbols to the symbols of that religion.
Screenshot: http://www.kamletos.si/view%20variables%206.JPG (The tiles)
- Detective now has his stuff in an old-styled cabinet. (Sprite by Hempuli)
- Got rid of some.. uhh... Runtime errors... and... uhh... A certain dungeon master... I... I WAS ORDERED TO DO IT, YELL AT URIST AND CREED!
- I doubt you'll get this far in reading this changelog due to the previous point, but just in case you do... Admin tools updated:
- View variables now has a "Mark Object" option. After you've marked an object or datum, you will be able to assign the value to a variable. An example would be if you try to put an item into a closet. You'd open view variables on the item you want to move, select "mark object", open 'view variables' of the closet, click E or C next to contents and select "marked datum (type)". After this, you select 'No' for the reference question.
Screenshot: http://www.kamletos.si/references.jpg
- Also in View variables, you can now access a player's 'Player panel' if you view a mob's variables.
- Updated changelog with these changes

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2225 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2011-09-18 22:05:00 +00:00
parent 34ec02d080
commit 2b1b121141
25 changed files with 4883 additions and 4537 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/closets/wardrobe.dm
+17
View File
@@ -167,3 +167,20 @@
new /obj/item/clothing/suit/lawyer/purpjacket(src)
new /obj/item/clothing/shoes/brown(src)
new /obj/item/clothing/shoes/black(src)
/obj/closet/cabinet/New()
..()
sleep(2)
new /obj/item/device/radio/headset/headset_sec(src)
new /obj/item/clothing/under/det( src )
new /obj/item/clothing/shoes/brown( src )
new /obj/item/clothing/head/det_hat( src )
new /obj/item/clothing/suit/det_suit( src )
new /obj/item/clothing/suit/det_suit/armor( src )
new /obj/item/weapon/storage/fcard_kit( src )
new /obj/item/clothing/gloves/black( src )
new /obj/item/weapon/storage/lglo_kit( src )
new /obj/item/weapon/fcardholder( src )
new /obj/item/weapon/clipboard( src )
new /obj/item/device/detective_scanner( src )
return
code/game/objects/washing_machine.dm
+104 -2
View File
@@ -20,6 +20,7 @@
//0 = not hacked
//1 = hacked
var/gibs_ready = 0
var/obj/item/toy/crayon/crayon
/obj/machinery/washing_machine/verb/start()
set name = "Start Washing"
@@ -38,6 +39,97 @@
sleep(200)
for(var/atom/A in contents)
A.clean_blood()
if(crayon)
var/color = crayon.colourName
if(color)
var/new_jumpsuit_icon_state = ""
var/new_jumpsuit_item_state = ""
var/new_jumpsuit_name = ""
var/new_glove_icon_state = ""
var/new_glove_item_state = ""
var/new_glove_name = ""
var/new_shoe_icon_state = ""
var/new_shoe_name = ""
var/new_sheet_icon_state = ""
var/new_sheet_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
//world << "DEBUG: [color] == [J.color]"
if(color == J.color)
new_jumpsuit_icon_state = J.icon_state
new_jumpsuit_item_state = J.item_state
new_jumpsuit_name = J.name
del(J)
//world << "DEBUG: YUP! [new_icon_state] and [new_item_state]"
break
del(J)
for(var/T in typesof(/obj/item/clothing/gloves))
var/obj/item/clothing/gloves/G = new T
//world << "DEBUG: [color] == [J.color]"
if(color == G.color)
new_glove_icon_state = G.icon_state
new_glove_item_state = G.item_state
new_glove_name = G.name
del(G)
//world << "DEBUG: YUP! [new_icon_state] and [new_item_state]"
break
del(G)
for(var/T in typesof(/obj/item/clothing/shoes))
var/obj/item/clothing/shoes/S = new T
//world << "DEBUG: [color] == [J.color]"
if(color == S.color)
new_shoe_icon_state = S.icon_state
new_shoe_name = S.name
del(S)
//world << "DEBUG: YUP! [new_icon_state] and [new_item_state]"
break
del(S)
for(var/T in typesof(/obj/item/weapon/bedsheet))
var/obj/item/weapon/bedsheet/B = new T
//world << "DEBUG: [color] == [J.color]"
if(color == B.color)
new_sheet_icon_state = B.icon_state
new_sheet_name = B.name
del(B)
//world << "DEBUG: YUP! [new_icon_state] and [new_item_state]"
break
del(B)
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!"
J.item_state = new_jumpsuit_item_state
J.icon_state = new_jumpsuit_icon_state
J.color = color
J.name = new_jumpsuit_name
J.desc = new_desc
if(new_glove_icon_state && new_glove_item_state && new_glove_name)
for(var/obj/item/clothing/gloves/G in contents)
//world << "DEBUG: YUP! FOUND IT!"
G.item_state = new_glove_item_state
G.icon_state = new_glove_icon_state
G.color = color
G.name = new_glove_name
G.desc = new_desc
if(new_shoe_icon_state && new_shoe_name)
for(var/obj/item/clothing/shoes/S in contents)
//world << "DEBUG: YUP! FOUND IT!"
S.icon_state = new_shoe_icon_state
S.color = color
S.name = new_shoe_name
S.desc = new_desc
if(new_sheet_icon_state && new_sheet_name)
for(var/obj/item/weapon/bedsheet/B in contents)
//world << "DEBUG: YUP! FOUND IT!"
B.icon_state = new_sheet_icon_state
B.color = color
B.name = new_sheet_name
B.desc = new_desc
del(crayon)
crayon = null
if( locate(/mob,contents) )
state = 7
gibs_ready = 1
@@ -62,7 +154,17 @@
/*if(istype(W,/obj/item/weapon/screwdriver))
panel = !panel
user << "\blue you [panel ? "open" : "close"] the [src]'s maintenance panel"*/
if(istype(W,/obj/item/weapon/grab))
if(istype(W,/obj/item/toy/crayon))
if( state in list( 1, 3, 6 ) )
if(!crayon)
user.drop_item()
crayon = W
crayon.loc = src
else
..()
else
..()
else if(istype(W,/obj/item/weapon/grab))
if( (state == 1) && hacked)
var/obj/item/weapon/grab/G = W
if(ishuman(G.assailant) && iscorgi(G.affecting))
@@ -71,7 +173,7 @@
state = 3
else
..()
if(istype(W,/obj/item/clothing/under) || istype(W,/obj/item/clothing/mask) || istype(W,/obj/item/clothing/head) || istype(W,/obj/item/clothing/gloves) || istype(W,/obj/item/clothing/shoes) || istype(W,/obj/item/clothing/suit))
else if(istype(W,/obj/item/clothing/under) || istype(W,/obj/item/clothing/mask) || istype(W,/obj/item/clothing/head) || istype(W,/obj/item/clothing/gloves) || istype(W,/obj/item/clothing/shoes) || istype(W,/obj/item/clothing/suit) || istype(W,/obj/item/weapon/bedsheet))
//YES, it's hardcoded... saves a var/can_be_washed for every single clothing item.
if ( istype(W,/obj/item/clothing/suit/space ) )