shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'evilew:master' into deature/buckle-stuckage-weight

Browse Source
This commit is contained in:
AlManiak
2024-12-02 21:16:19 +01:00
committed by GitHub
parent 95ef6f6942 25403cbf76
commit c5b9b0d69d
21 changed files with 1447 additions and 965 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/code/game/donator.dm
+108 -105
View File
@@ -1,130 +1,133 @@
//GS13: donator items and other ckey-locked junk
/datum/gear/donator/gatobadge_employee //these are available only to admins with CC-related characters
name = "GATO Badge - Employee"
category = LOADOUT_CATEGORY_DONATOR
path = /obj/item/clothing/accessory/medal/gato_badge/employee
ckeywhitelist = list("sonoida", "yeeny")
/datum/gear/donator/gatobadge_middleman //these are available to players who were granted permission to have their characters to CC
name = "GATO Badge - Correspondent"
category = LOADOUT_CATEGORY_DONATOR
path = /obj/item/clothing/accessory/medal/gato_badge/middleman
ckeywhitelist = list("johnjimjim", "sonoida", "yeeny", "Not Number", "Not_Number", "NotNumber",)
//commented out everything here, it's bugged
/datum/gear/donator/halsey_overcoat
name = "Halsey's Commander Overcoat"
category = LOADOUT_CATEGORY_DONATOR
path = /obj/item/clothing/suit/chloe/halsey
ckeywhitelist = list("yeeny")
// /datum/gear/donator/gatobadge_employee //these are available only to admins with CC-related characters
// name = "GATO Badge - Employee"
// category = LOADOUT_CATEGORY_DONATOR
// path = /obj/item/clothing/accessory/medal/gato_badge/employee
// ckeywhitelist = list("sonoida", "yeeny")
/datum/gear/donator/haydee_suit
name = "Haydee Suit"
category = LOADOUT_CATEGORY_DONATOR
path = /obj/item/clothing/suit/space/hardsuit/engine/haydee
ckeywhitelist = list("lumu", "sonoida")
// /datum/gear/donator/gatobadge_middleman //these are available to players who were granted permission to have their characters to CC
// name = "GATO Badge - Correspondent"
// category = LOADOUT_CATEGORY_DONATOR
// path = /obj/item/clothing/accessory/medal/gato_badge/middleman
// ckeywhitelist = list("johnjimjim", "sonoida", "yeeny", "Not Number", "Not_Number", "NotNumber",)
/datum/gear/donator/haydee_pistol
name = "Haydee Pistol"
category = LOADOUT_CATEGORY_DONATOR
path = /obj/item/gun/ballistic/automatic/toy/pistol/haydee
ckeywhitelist = list("lumu", "sonoida")
// /datum/gear/donator/halsey_overcoat
// name = "Halsey's Commander Overcoat"
// category = LOADOUT_CATEGORY_DONATOR
// path = /obj/item/clothing/suit/chloe/halsey
// ckeywhitelist = list("yeeny")
/datum/gear/donator/rose_plush
name = "Dezir Rose Plush"
category = LOADOUT_CATEGORY_DONATOR
path = /obj/item/toy/plush/gs13/rose
ckeywhitelist = list("eremitanovem", "sonoida")
// /datum/gear/donator/haydee_suit
// name = "Haydee Suit"
// category = LOADOUT_CATEGORY_DONATOR
// path = /obj/item/clothing/suit/space/hardsuit/engine/haydee
// ckeywhitelist = list("lumu", "sonoida")
/datum/gear/donator/chloe_plush
name = "Chloe Plush"
category = LOADOUT_CATEGORY_DONATOR
path = /obj/item/toy/plush/gs13/chloe
ckeywhitelist = list("alphas0")
// /datum/gear/donator/haydee_pistol
// name = "Haydee Pistol"
// category = LOADOUT_CATEGORY_DONATOR
// path = /obj/item/gun/ballistic/automatic/toy/pistol/haydee
// ckeywhitelist = list("lumu", "sonoida")
/datum/gear/donator/grimmy_coat
name = "Overcoat of the Destitute"
category = LOADOUT_CATEGORY_DONATOR
path = /obj/item/clothing/suit/storage/blueshield/grimmy
ckeywhitelist = list("bbgrimmy")
// /datum/gear/donator/rose_plush
// name = "Dezir Rose Plush"
// category = LOADOUT_CATEGORY_DONATOR
// path = /obj/item/toy/plush/gs13/rose
// ckeywhitelist = list("eremitanovem", "sonoida")
/datum/gear/donator/tarek_gps
name = "Tarek's GPS"
category = LOADOUT_CATEGORY_DONATOR
path = /obj/item/gps/mining
ckeywhitelist = list("e926user25")
// /datum/gear/donator/chloe_plush
// name = "Chloe Plush"
// category = LOADOUT_CATEGORY_DONATOR
// path = /obj/item/toy/plush/gs13/chloe
// ckeywhitelist = list("alphas0")
/datum/gear/donator/milwaukee_crowbar
name = "Milwaukee Pocket Crowbar"
category = LOADOUT_CATEGORY_DONATOR
path = /obj/item/crowbar/bronze/glaug
ckeywhitelist = list("happytpr")
// /datum/gear/donator/grimmy_coat
// name = "Overcoat of the Destitute"
// category = LOADOUT_CATEGORY_DONATOR
// path = /obj/item/clothing/suit/storage/blueshield/grimmy
// ckeywhitelist = list("bbgrimmy")
/datum/gear/donator/fatfang
name = "Fattening Fangs Injector"
category = LOADOUT_CATEGORY_DONATOR
path = /obj/item/dnainjector/fatfang
ckeywhitelist = list("sonoida")
// /datum/gear/donator/tarek_gps
// name = "Tarek's GPS"
// category = LOADOUT_CATEGORY_DONATOR
// path = /obj/item/gps/mining
// ckeywhitelist = list("e926user25")
/datum/gear/donator/toolbelt
name = "Empty Toolbelt"
category = LOADOUT_CATEGORY_DONATOR
path = /obj/item/storage/belt/utility
ckeywhitelist = list("killmewitha22", "Killmewitha22", "KILLMEWITHA22", "sonoida")
// /datum/gear/donator/milwaukee_crowbar
// name = "Milwaukee Pocket Crowbar"
// category = LOADOUT_CATEGORY_DONATOR
// path = /obj/item/crowbar/bronze/glaug
// ckeywhitelist = list("happytpr")
//metha rossi you fat hog
// /datum/gear/donator/fatfang
// name = "Fattening Fangs Injector"
// category = LOADOUT_CATEGORY_DONATOR
// path = /obj/item/dnainjector/fatfang
// ckeywhitelist = list("sonoida")
/datum/gear/donator/wgspell_add
name = "Weight Gain Spellbook"
category = LOADOUT_CATEGORY_DONATOR
path = /obj/item/book/granter/spell/fattening
ckeywhitelist = list("sonoida", "themrsky", "Not Number")
// /datum/gear/donator/toolbelt
// name = "Empty Toolbelt"
// category = LOADOUT_CATEGORY_DONATOR
// path = /obj/item/storage/belt/utility
// ckeywhitelist = list("killmewitha22", "Killmewitha22", "KILLMEWITHA22", "sonoida")
/datum/gear/donator/wgspell_transfer
name = "Weight Transfer Spellbook"
category = LOADOUT_CATEGORY_DONATOR
path = /obj/item/book/granter/spell/fattening/transfer
ckeywhitelist = list("sonoida", "themrsky", "Not Number")
// //metha rossi you fat hog
/datum/gear/donator/wgspell_take
name = "Weight Steal Spellbook"
category = LOADOUT_CATEGORY_DONATOR
path = /obj/item/book/granter/spell/fattening/steal
ckeywhitelist = list("sonoida", "themrsky", "Not Number")
// /datum/gear/donator/wgspell_add
// name = "Weight Gain Spellbook"
// category = LOADOUT_CATEGORY_DONATOR
// path = /obj/item/book/granter/spell/fattening
// ckeywhitelist = list("sonoida", "themrsky", "Not Number")
/datum/gear/donator/white_eyepatch_cabal
name = "Cabal's Eyepatch"
category = LOADOUT_CATEGORY_DONATOR
path = /obj/item/clothing/glasses/eyepatch/cabal
ckeywhitelist = list("spess_lizurd", "SPESS LIZURD", "spess lizurd", "SPESS_LIZURD", "spesslizurd", "sonoida")
// /datum/gear/donator/wgspell_transfer
// name = "Weight Transfer Spellbook"
// category = LOADOUT_CATEGORY_DONATOR
// path = /obj/item/book/granter/spell/fattening/transfer
// ckeywhitelist = list("sonoida", "themrsky", "Not Number")
/datum/gear/white_eyepatch //accessible to anyone, at donator's request
name = "White Eyepatch"
category = LOADOUT_CATEGORY_GLASSES
path = /obj/item/clothing/glasses/eyepatch/white
// /datum/gear/donator/wgspell_take
// name = "Weight Steal Spellbook"
// category = LOADOUT_CATEGORY_DONATOR
// path = /obj/item/book/granter/spell/fattening/steal
// ckeywhitelist = list("sonoida", "themrsky", "Not Number")
/datum/gear/donator/metis_plush
name = "Metis Plush"
category = LOADOUT_CATEGORY_DONATOR
path = /obj/item/toy/plush/gs13/metis
ckeywhitelist = list("paraillegal", "Paraillegal")
// /datum/gear/donator/white_eyepatch_cabal
// name = "Cabal's Eyepatch"
// category = LOADOUT_CATEGORY_DONATOR
// path = /obj/item/clothing/glasses/eyepatch/cabal
// ckeywhitelist = list("spess_lizurd", "SPESS LIZURD", "spess lizurd", "SPESS_LIZURD", "spesslizurd", "sonoida")
/datum/gear/donator/wheelys
name = "Wheely-Heels"
category = LOADOUT_CATEGORY_DONATOR
path = /obj/item/clothing/shoes/wheelys
ckeywhitelist = list("colorlessspy", "Colorlessspy")
// /datum/gear/white_eyepatch //accessible to anyone, at donator's request
// name = "White Eyepatch"
// category = LOADOUT_CATEGORY_GLASSES
// path = /obj/item/clothing/glasses/eyepatch/white
/datum/gear/donator/crowbars_plush
name = "Crowbars Plush"
category = LOADOUT_CATEGORY_DONATOR
path = /obj/item/toy/plush/gs13/crowbars
ckeywhitelist = list("M16nPregnant", "m16npregnant" )
// /datum/gear/donator/metis_plush
// name = "Metis Plush"
// category = LOADOUT_CATEGORY_DONATOR
// path = /obj/item/toy/plush/gs13/metis
// ckeywhitelist = list("paraillegal", "Paraillegal")
/datum/gear/donator/sams_welder
name = "Sam's Unlucky Welder"
category = LOADOUT_CATEGORY_DONATOR
path = /obj/item/weldingtool/bronze
ckeywhitelist = list("almaniak", "Almaniak", "AlManiak")
// /datum/gear/donator/wheelys
// name = "Wheely-Heels"
// category = LOADOUT_CATEGORY_DONATOR
// path = /obj/item/clothing/shoes/wheelys
// ckeywhitelist = list("colorlessspy", "Colorlessspy")
// /datum/gear/donator/crowbars_plush
// name = "Crowbars Plush"
// category = LOADOUT_CATEGORY_DONATOR
// path = /obj/item/toy/plush/gs13/crowbars
// ckeywhitelist = list("M16nPregnant", "m16npregnant" )
// /datum/gear/donator/sams_welder
// name = "Sam's Unlucky Welder"
// category = LOADOUT_CATEGORY_DONATOR
// path = /obj/item/weldingtool/bronze
// ckeywhitelist = list("almaniak", "Almaniak", "AlManiak")
//
//item presets for donator items
GainStation13/code/mechanics/transformation/food.dm
+3 -3
View File
@@ -4,12 +4,12 @@
return FALSE
var/mob/living/food_mob = transformation_component.transformed_mob
if(!istype(food_mob) || !(food_mob?.vore_flags & DEVOURABLE) || (eater?.vore_flags & NO_VORE) || !istype(eater.vore_selected))
var/obj/belly/vore_belly = eater?.vore_selected
if(!istype(food_mob) || !(food_mob?.vore_flags & DEVOURABLE) || (eater?.vore_flags & NO_VORE) || !istype(vore_belly))
return FALSE
qdel(transformation_component)
var/obj/belly/vore_belly = eater.vore_selected
if(!vore_belly.nom_mob(food_mob,eater))
if(!vore_belly?.nom_mob(food_mob,eater))
return FALSE
return TRUE
GainStation13/code/mechanics/transformation/transformation_component.dm
+13 -3
View File
@@ -21,13 +21,17 @@
var/able_to_struggle_out = TRUE
/// Transfer to vore belly when eaten
var/transfer_to_vore = TRUE
/// Has the mob already been removed?
var/mob_removed = FALSE
/datum/component/transformation_item/Initialize()
RegisterSignal(parent, COMSIG_PARENT_EXAMINE, PROC_REF(examine))
RegisterSignal(parent, COMSIG_PARENT_QDELETING, PROC_REF(remove_mob))
RegisterSignal(parent, COMSIG_PARENT_PREQDELETED, PROC_REF(remove_mob))
/datum/component/transformation_item/Destroy(force, silent)
remove_mob()
if(!mob_removed)
remove_mob()
return ..()
/datum/component/transformation_item/proc/examine(datum/source, mob/user, list/examine_list)
@@ -51,6 +55,7 @@
ADD_TRAIT(mob_to_register, TRAIT_RESISTCOLD, src)
ADD_TRAIT(mob_to_register, TRAIT_RESISTLOWPRESSURE, src)
ADD_TRAIT(mob_to_register, TRAIT_LOWPRESSURECOOLING, src)
ADD_TRAIT(mob_to_register, TRAIT_NOBREATH, src)
if(!able_to_speak)
ADD_TRAIT(mob_to_register, TRAIT_MUTE, src)
@@ -91,6 +96,7 @@
REMOVE_TRAIT(transformed_mob, TRAIT_RESISTCOLD, src)
REMOVE_TRAIT(transformed_mob, TRAIT_RESISTLOWPRESSURE, src)
REMOVE_TRAIT(transformed_mob, TRAIT_LOWPRESSURECOOLING, src)
REMOVE_TRAIT(transformed_mob, TRAIT_NOBREATH, src)
var/mob/living/carbon/human/human_mob = transformed_mob
if(istype(human_mob))
@@ -99,7 +105,11 @@
human_mob.update_disabled_bodyparts()
var/atom/parent_atom = parent
transformed_mob.forceMove(parent_atom.loc)
var/turf/parent_turf = get_turf(parent_atom)
transformed_mob.forceMove(parent_turf)
if(scale_object)
parent_atom.transform = null
mob_removed = TRUE
qdel(src)