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

Merge branch 'origin/HEAD'

Browse Source
This commit is contained in:
DynaJ0ule
2023-02-06 12:31:43 -05:00
parent 8da38160f3
commit 5209413204
106 changed files with 4743 additions and 757 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/syndicate.dm
+1
View File
@@ -104,6 +104,7 @@
/obj/item/stack/sheet/mineral/uranium,
/obj/item/stack/sheet/mineral/diamond,
/obj/item/stack/sheet/mineral/bananium,
/obj/item/stack/sheet/mineral/calorite,
/obj/item/stack/sheet/plasteel,
/obj/item/stack/sheet/mineral/titanium,
/obj/item/stack/sheet/mineral/plastitanium,
code/game/objects/structures/door_assembly_types.dm
+9
View File
@@ -216,6 +216,15 @@
mineral = "bananium"
glass_type = /obj/machinery/door/airlock/bananium/glass
// /obj/structure/door_assembly/door_assembly_calorite //GS13
// name = "calorite airlock assembly"
// desc = "Very inviting."
// icon = 'icons/obj/doors/airlocks/station/calorite.dmi'
// base_name = "calorite airlock"
// airlock_type = /obj/machinery/door/airlock/calorite
// mineral = "calorite"
// glass_type = /obj/machinery/door/airlock/calorite/glass
/obj/structure/door_assembly/door_assembly_sandstone
name = "sandstone airlock assembly"
icon = 'icons/obj/doors/airlocks/station/sandstone.dmi'
code/game/objects/structures/false_walls.dm
+37
View File
@@ -263,6 +263,43 @@
walltype = /turf/closed/wall/mineral/bananium
canSmoothWith = list(/obj/structure/falsewall/bananium, /turf/closed/wall/mineral/bananium)
/obj/structure/falsewall/calorite //GS13
name = "calorite wall"
desc = "A wall with calorite plating. Burp."
icon = 'icons/turf/walls/calorite_wall.dmi'
icon_state = "calorite"
mineral = /obj/item/stack/sheet/mineral/calorite
walltype = /turf/closed/wall/mineral/calorite
canSmoothWith = list(/obj/structure/falsewall/calorite, /turf/closed/wall/mineral/calorite)
var/active = null
var/last_event = 0
/obj/structure/falsewall/calorite/proc/fatten()
if(!active)
if(world.time > last_event+15)
active = 1
for(var/mob/living/carbon/human/M in orange(3,src))
if(HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
return
else
M.fatness = M.fatness + 50
last_event = world.time
active = null
return
return
/obj/structure/falsewall/calorite/Bumped(atom/movable/AM)
fatten()
..()
/obj/structure/falsewall/calorite/attackby(obj/item/W, mob/user, params)
fatten()
return ..()
/obj/structure/falsewall/calorite/attack_hand(mob/user)
fatten()
. = ..()
/obj/structure/falsewall/sandstone
name = "sandstone wall"
code/game/objects/structures/statues.dm
+95
View File
@@ -318,3 +318,98 @@
name = "blueberry statue"
desc = "A statue resembling a poor humanoid creature shaped like a ball."
icon_state = "blueberry"
//////////////////////////////CALORITE - GS13///////////////////////////////
/obj/structure/statue/calorite
max_integrity = 400
material_drop_type = /obj/item/stack/sheet/mineral/calorite
/obj/structure/statue/calorite/fatty
name = "Fatty statue"
desc = "A statue of a well-rounded fatso."
icon_state = "fatty"
var/active = null
var/last_event = 0
/obj/structure/statue/calorite/fatty/proc/beacon()
if(!active)
if(world.time > last_event+15)
active = 1
for(var/mob/living/carbon/human/M in orange(3,src))
to_chat(M, "<span class='warning'>You feel the statue calling to you, urging you to touch it...</span>")
last_event = world.time
active = null
return
return
/obj/structure/statue/calorite/fatty/Bumped(atom/movable/AM)
beacon()
..()
/obj/structure/statue/calorite/fatty/Crossed(var/mob/AM)
.=..()
if(!.)
if(istype(AM))
beacon()
/obj/structure/statue/calorite/fatty/Moved(atom/movable/AM)
beacon()
..()
/obj/structure/statue/calorite/fatty/attackby(obj/item/W, mob/living/carbon/M, params)
if(HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
to_chat(M, "<span class='warning'>Nothing happens.</span>")
else
M.fatness = M.fatness + 20
if(M.fatness < 200)
to_chat(M, "<span class='warning'>The moment your hand meets the statue, you feel a little warmer...</span>")
if(HAS_TRAIT(M, TRAIT_FAT))
to_chat(M, "<span class='warning'>Upon each poke of the statue, you feel yourself get a little heavier.</span>")
if(HAS_TRAIT(M, TRAIT_OBESE))
to_chat(M, "<span class='warning'>With each touch you keep getting fatter... But the fatter you grow, the more enticed you feel to poke the statue.</span>")
if(HAS_TRAIT(M, TRAIT_MORBIDLYOBESE))
to_chat(M, "<span class='warning'>The world around you blurs as you focus on prodding the statue, your waistline widening further...</span>")
if(HAS_TRAIT(M, TRAIT_IMMOBILE))
to_chat(M, "<span class='warning'>A whispering voice gently compliments your massive body, your own mind begging to touch the statue more.</span>")
if(HAS_TRAIT(M, TRAIT_BLOB))
to_chat(M, "<span class='warning'>You can barely reach the statue past your floor-covering stomach! And yet, it still calls to you...</span>")
/obj/structure/statue/calorite/fatty/attack_hand(mob/living/carbon/M)
if(HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
to_chat(M, "<span class='warning'>Nothing happens.</span>")
else
M.fatness = M.fatness + 20
if(M.fatness < 200)
to_chat(M, "<span class='warning'>The moment your hand meets the statue, you feel a little warmer...</span>")
if(HAS_TRAIT(M, TRAIT_FAT))
to_chat(M, "<span class='warning'>Upon each poke of the statue, you feel yourself get a little heavier.</span>")
if(HAS_TRAIT(M, TRAIT_OBESE))
to_chat(M, "<span class='warning'>With each touch you keep getting fatter... But the fatter you grow, the more enticed you feel to poke the statue.</span>")
if(HAS_TRAIT(M, TRAIT_MORBIDLYOBESE))
to_chat(M, "<span class='warning'>The world around you blurs as you focus on prodding the statue, your waistline widening further...</span>")
if(HAS_TRAIT(M, TRAIT_IMMOBILE))
to_chat(M, "<span class='warning'>A whispering voice gently compliments your massive body, your own mind begging to touch the statue more.</span>")
if(HAS_TRAIT(M, TRAIT_BLOB))
to_chat(M, "<span class='warning'>You can barely reach the statue past your floor-covering stomach! And yet, it still calls to you...</span>")
/obj/structure/statue/calorite/fatty/attack_paw(mob/living/carbon/M)
if(HAS_TRAIT(M, TRAIT_LIPOIFIER_IMMUNE))
to_chat(M, "<span class='warning'>Nothing happens.</span>")
else
M.fatness = M.fatness + 20
if(M.fatness < 200)
to_chat(M, "<span class='warning'>The moment your hand meets the statue, you feel a little warmer...</span>")
if(HAS_TRAIT(M, TRAIT_FAT))
to_chat(M, "<span class='warning'>Upon each poke of the statue, you feel yourself get a little heavier.</span>")
if(HAS_TRAIT(M, TRAIT_OBESE))
to_chat(M, "<span class='warning'>With each touch you keep getting fatter... But the fatter you grow, the more enticed you feel to poke the statue.</span>")
if(HAS_TRAIT(M, TRAIT_MORBIDLYOBESE))
to_chat(M, "<span class='warning'>The world around you blurs as you focus on prodding the statue, your waistline widening further...</span>")
if(HAS_TRAIT(M, TRAIT_IMMOBILE))
to_chat(M, "<span class='warning'>A whispering voice gently compliments your massive body, your own mind begging to touch the statue more.</span>")
if(HAS_TRAIT(M, TRAIT_BLOB))
to_chat(M, "<span class='warning'>You can barely reach the statue past your floor-covering stomach! And yet, it still calls to you...</span>")