cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-26 21:46:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/atmoalter/portable_atmospherics.dm
	code/game/machinery/spaceheater.dm
	code/modules/clothing/head/soft_caps.dm
	maps/exodus-5.dmm
This commit is contained in:
PsiOmega
2015-08-12 21:18:18 +02:00
parent 6fa5d2d81e ad240caf13
commit ba240cb768
39 changed files with 537 additions and 437 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/holodeck/HolodeckObjects.dm
+2 -2
View File
@@ -46,8 +46,8 @@
/obj/structure/holostool
name = "stool"
desc = "Apply butt."
icon = 'icons/obj/objects.dmi'
icon_state = "stool"
icon = 'icons/obj/furniture.dmi'
icon_state = "stool_padded_preview"
anchored = 1.0
pressure_resistance = 15