cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed a bug where the removal of cable-cuffs with wirecutters displayed the "you have removed..." message to everyone and the "X has removed Y's cuffs..." to the person whose cuffs got cut off.

Browse Source 
- Added the tanning micro-mechanic. Hide still not available in-game yet tho until sprites are added and some use for leather is made. I'll get on that soon<TM>

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3794 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
baloh.matevz
2012-06-11 17:36:03 +00:00
parent 68aface68a
commit fb29642e48
7 changed files with 102 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/weapons/tools.dm
View File

@@ -376,8 +376,8 @@ WELDINGTOOOL
/obj/item/weapon/wirecutters/attack(mob/M as mob, mob/user as mob)
if((M.handcuffed) && (istype(M:handcuffed, /obj/item/weapon/handcuffs/cable)))
M.visible_message("You cut \the [M]'s restraints with \the [src]!",\
"\The [usr] cuts \the [M]'s restraints with \the [src]!",\
usr.visible_message("\The [usr] cuts \the [M]'s restraints with \the [src]!",\
"You cut \the [M]'s restraints with \the [src]!",\
"You hear cable being cut.")
M.handcuffed = null
M.update_clothing()

3
code/game/objects/stacks/stack.dm
View File

@@ -28,7 +28,8 @@
if (src.amount<=0)
var/oldsrc = src
src = null //dont kill proc after del()
usr.before_take_item(oldsrc)
if(usr)
usr.before_take_item(oldsrc)
del(oldsrc)
return

16
code/game/objects/washing_machine.dm
View File

@@ -40,6 +40,13 @@
for(var/atom/A in contents)
A.clean_blood()
//Tanning!
for(var/obj/item/stack/sheet/hairlesshide/HH in contents)
var/obj/item/stack/sheet/wetleather/WL = new(src)
WL.amount = HH.amount
del(HH)
if(crayon)
var/color
if(istype(crayon,/obj/item/toy/crayon))
@@ -180,7 +187,14 @@
state = 3
else
..()
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))
else if(istype(W,/obj/item/stack/sheet/hairlesshide) || \
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 ) )