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

Merge pull request #3090 from CHOMPStationBot/upstream-merge-11535

Browse Source 
[MIRROR] Misc additions I made while sleep deprived
This commit is contained in:
Nadyr
2021-10-22 19:46:46 -04:00
committed by GitHub
parent 633d6cc469 19a5b9d316
commit 024c8d1dd0
6 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/barricades.dm
+6
View File
@@ -104,6 +104,12 @@
return TRUE
return FALSE
/obj/structure/barricade/planks
name = "crude barricade"
icon_state = "barricade_planks"
health = 50
maxhealth = 50
/obj/structure/barricade/sandbag
name = "sandbags"
desc = "Bags. Bags of sand. It's rough and coarse and somehow stays in the bag."
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+1 -1
View File
@@ -301,7 +301,7 @@
/obj/structure/bed/roller/Moved(atom/old_loc, direction, forced = FALSE)
. = ..()
playsound(src, 'sound/effects/roll.ogg', 100, 1)
/obj/structure/bed/roller/post_buckle_mob(mob/living/M as mob)