cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 22:13:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/setup.dm
	icons/mob/items_righthand.dmi
	maps/exodus-1.dmm
	maps/exodus-5.dmm
This commit is contained in:
PsiOmega
2015-03-13 09:23:26 +01:00
parent 9c30024ca0 949d1fa5b8
commit ce30b00287
69 changed files with 3159 additions and 2935 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/structures/under_wardrobe.dm
View File

@@ -3,7 +3,7 @@
desc = "Holds item of clothing you shouldn't be showing off in the hallways."
icon = 'icons/obj/closet.dmi'
icon_state = "cabinet_closed"
density = 1
/obj/structure/undies_wardrobe/attack_hand(mob/user as mob)
src.add_fingerprint(user)