cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-10 07:30:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into bobross

Browse Source
This commit is contained in:
Archie
2021-07-19 22:53:33 -03:00
parent 8e982a32c4 f914df3bc4
commit b443f02b6d
164 changed files with 4163 additions and 3317 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/false_walls.dm
+1 -1
View File
@@ -271,7 +271,7 @@
icon_state = "sandstone"
mineral = /obj/item/stack/sheet/mineral/sandstone
walltype = /turf/closed/wall/mineral/sandstone
canSmoothWith = list(/obj/structure/falsewall/sandstone, /turf/closed/wall/mineral/sandstone)
canSmoothWith = list(/obj/structure/falsewall/sandstone, /turf/closed/wall/mineral/sandstone, /obj/structure/window/fulltile)
/obj/structure/falsewall/wood
name = "wooden wall"
code/game/objects/structures/statues.dm
+8
View File
@@ -290,6 +290,14 @@
icon = 'icons/obj/statuelarge.dmi'
icon_state = "venus"
/obj/structure/statue/sandstone/abs
max_integrity = 300
anchored = TRUE
name = "ancient statue"
desc = "An ancient statue, representing one of the gods. It almost seems like it's alive."
icon = 'icons/obj/statue_egypty.dmi'
icon_state = "abs"
/////////////////////snow/////////////////////////////////////////
/obj/structure/statue/snow
code/game/objects/structures/traps.dm
+2
View File
@@ -65,6 +65,8 @@
var/mob/M = AM
if(M.mind in immune_minds)
return
if(M.anti_magic_check())
flare()
if(charges <= 0)
return
flare()
code/game/objects/structures/window.dm
+3 -1
View File
@@ -516,7 +516,9 @@
/obj/machinery/door/airlock/hatch,
/obj/machinery/door/airlock/engineering/glass/critical,
/obj/machinery/door/airlock/atmos,
/obj/machinery/door/airlock/highsecurity,)
/obj/machinery/door/airlock/highsecurity,
/turf/closed/wall/mineral/sandstone,
/obj/structure/falsewall/sandstone,)
// canSmoothWith = list(/obj/structure/window/fulltile, /obj/structure/window/reinforced/fulltile, /obj/structure/window/reinforced/tinted/fulltile, /obj/structure/window/plasma/fulltile, /obj/structure/window/plasma/reinforced/fulltile)
glass_amount = 2