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

more changes

Browse Source
This commit is contained in:
Metis
2024-09-13 11:15:03 -04:00
parent 7b0780804f
commit cb6a43a7bf
64 changed files with 228 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/code/modules/clothing/under/jobs/clothing.dm
+2
View File
@@ -0,0 +1,2 @@
/obj/item/clothing
var/alternate_worn_icon
GainStation13/code/modules/food_and_drinks/recipes_bigpizza.dm
+1 -1
View File
@@ -65,7 +65,7 @@
tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "delight" = 5)
foodtype = GRAIN | VEGETABLES | DAIRY | JUNKFOOD
/obj/item/reagent_containers/food/snacks/pizza/framewrecker/attackby(var/obj/item/weapon/W, var/mob/living/user)
/obj/item/reagent_containers/food/snacks/pizza/framewrecker/attackby(var/obj/item/W, var/mob/living/user)
if(istype(W,/obj/item/kitchen/knife))
user.visible_message("<b>\The [user]</b> starts to slowly cut through The One Pizza.", "<span class='notice'>You start to slowly cut through The One Pizza.</span>")
if(!src)
GainStation13/code/modules/gym/gym.dm
+9 -9
View File
@@ -8,7 +8,7 @@
w_class = WEIGHT_CLASS_BULKY
throw_speed = 2
throw_range = 3
materials = list(MAT_METAL=10)
custom_materials = list(/datum/material/iron=10)
pressure_resistance = 2
var/reps = 0
var/using = FALSE
@@ -16,7 +16,7 @@
/obj/item/dumbbell/dropped(mob/user, silent)
reps = 0
. = ..()
/obj/item/dumbbell/attack_self(mob/user)
. = ..()
if(!using)
@@ -42,12 +42,12 @@
var/fatloss = -10
/obj/machinery/treadmill/Uncross(atom/movable/AM, atom/newloc)
if(stat & BROKEN)
if(machine_stat & BROKEN)
return ..()
if(!isliving(AM))
return ..()
var/mob/living/M = AM
if(M.throwing || M.floating || M.is_flying()) //Make sure they're not going over it
if(M.throwing || (M.movement_type & FLOATING) || M.is_flying()) //Make sure they're not going over it
return ..()
if(AM.dir != dir) //Make sure they're going into the treadmill
return ..()
@@ -64,11 +64,11 @@
C.adjust_fatness(fatloss, FATTENING_TYPE_WEIGHT_LOSS)
flick("conveyor-1", src)
return FALSE
/obj/machinery/treadmill/RefreshParts(obj/item/O, mob/user, params)
for(var/obj/item/stock_parts/manipulator/M in component_parts)
fatloss += M.rating * -10
/obj/machinery/treadmill/attackby(obj/item/O, mob/living/user, params)
if(default_deconstruction_screwdriver(user, "conveyor0", "conveyor0", O))
return TRUE
@@ -90,7 +90,7 @@
name = "Treadmill Board"
id = "treadmill"
build_type = AUTOLATHE | PROTOLATHE
materials = list(MAT_METAL = 50, MAT_GLASS = 50)
materials = list(/datum/material/iron = 50, /datum/material/glass = 50)
build_path = /obj/item/circuitboard/machine/treadmill
category = list("inital", "Construction")
departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING
@@ -99,7 +99,7 @@
name = "Dumbbell"
id = "dumbbell"
build_type = AUTOLATHE
materials = list(MAT_METAL = 2000)
materials = list(/datum/material/iron = 2000)
build_path = /obj/item/dumbbell
category = list("initial", "Tools")
/*
@@ -107,7 +107,7 @@
name = "Treadmill"
id = "treadmill"
build_type = AUTOLATHE
materials = list(MAT_METAL = 5000)
materials = list(/datum/material/iron = 5000)
build_path = /obj/item/conveyor_construct/treadmill
category = list("initial", "Construction")
*/
GainStation13/code/modules/hydroponics/lipoplant.dm
-1
View File
@@ -35,7 +35,6 @@
attack_verb = list("klonked", "donked", "bonked")
distill_reagent = "creme_de_coconut"
var/opened = FALSE
sharpness = IS_BLUNT
/obj/item/reagent_containers/food/snacks/grown/lipofruit/attackby(obj/item/W, mob/user, params)
if(!opened && W.sharpness)
GainStation13/code/modules/hydroponics/munchies_weed.dm
+4
View File
@@ -1,6 +1,10 @@
/mob/living/carbon
var/nutri_mult = 1
/datum/plant_gene/trait/glow/orange
name = "Orange Bioluminescence"
glow_color = "#ff9166"
/obj/item/seeds/cannabis/munchies
name = "pack of munchies weed seeds"
desc = "These seeds grow into munchies weed."
GainStation13/code/modules/mapping/areas.dm
+33
View File
@@ -0,0 +1,33 @@
/area/fatlab //GS13 - move this elsewhere later
name = "Mysterious Facility"
icon_state = "centcom"
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
requires_power = FALSE
has_gravity = STANDARD_GRAVITY
flags_1 = NONE
/area/crew_quarters/fitness/sauna
name = "Saunas"
icon_state = "dk_yellow"
/area/xenoarch/caloriteresearch_powered
name = "Research Facility Ruins"
icon_state = "dk_yellow"
power_light = TRUE
/area/xenoarch/caloriteresearch_unpowered
name = "Research Facility Ruins"
icon_state = "dk_yellow"
power_light = TRUE
/area/ruin/space/has_grav/fastfood_main
name = "GATO Restaurant - Main Area"
has_gravity = TRUE
/area/ruin/space/has_grav/fastfood_employee
name = "Restaurant Employee Area"
has_gravity = TRUE
/area/ruin/space/has_grav/feedersden
name = "Unknown Outpost"
has_gravity = TRUE
GainStation13/code/modules/mob/living/emote.dm
+7 -5
View File
@@ -22,10 +22,11 @@
. = ..()
if(!.)
return FALSE
playsound_prefed(user, noise_type, noise_pref, 100, TRUE, -4)
user.reduce_fullness(rand(reduction_min,reduction_max))
var/mob/living/carbon/carbon_user = user
carbon_user.reduce_fullness(rand(reduction_min,reduction_max))
/datum/emote/living/burp/fart //Butt burp.
key = "fart"
@@ -77,7 +78,7 @@
key = "goonfart"
key_third_person = "goonfarts"
noise_type = 'goon/sound/voice/farts/fart4.ogg'
//Shhh... It's a secret! Don't tell or I'll steal your legs
/datum/emote/living/burunyu
key = "burunyu"
@@ -96,5 +97,6 @@
. = ..()
if(!.)
return FALSE
user.reduce_fullness(rand(4,16), FALSE)
var/mob/living/carbon/carbon_user = user
carbon_user.reduce_fullness(rand(4,16), FALSE)
GainStation13/code/modules/mob/living/emote_ported.dm
+25 -3
View File
@@ -1,8 +1,8 @@
// This is an emote file for random shit we've ported. Im just copying the style recipes_ported.dm did, yell at me if im wrong later.
// It said it was lazy but personally I think this might be a better way of organizing otherwise unique content that we're porting
// It said it was lazy but personally I think this might be a better way of organizing otherwise unique content that we're porting
// for ourselves. -Reo
// I found this tacked onto the bottom of code/modules/mob/living/emote.dm. No //code add: notice or anything. Moving it here,
// I found this tacked onto the bottom of code/modules/mob/living/emote.dm. No //code add: notice or anything. Moving it here,
// since it seems to all be ported emotes. -Reo
/*
//Carl wuz here
@@ -96,6 +96,28 @@
//End of the random emotes I found in mob/living
/datum/emote/living
/// What sound do we want to play?
var/sound
/datum/emote/living/proc/get_sound()
return
/datum/emote/living/run_emote(mob/living/user, params, type_override, intentional)
. = ..()
if(!. || user.is_muzzled())
return
var/sound_to_play = sound
if(!sound)
sound_to_play = get_sound()
if(!sound_to_play)
return
playsound(user.loc, sound_to_play, 50, 1, 4, 1.2)
//Rewrites of the above start.
/datum/emote/living/carbon/racc
key = "racc_chitter"
@@ -121,7 +143,7 @@
'hyperstation/sound/voice/emotes/bat_c5.ogg','hyperstation/sound/voice/emotes/bat_c6.ogg', \
'hyperstation/sound/voice/emotes/bat_c7.ogg', 'hyperstation/sound/voice/emotes/bat_c8.ogg',\
'hyperstation/sound/voice/emotes/bat_c9.ogg')
//Rewrites of the above end.
//Ported from Vorestation
GainStation13/code/modules/mob/living/fullness.dm
+4 -4
View File
@@ -1,12 +1,12 @@
/mob/living/proc/reduce_fullness(amount, notify = TRUE) // fullness_amount should be between 5 and 20 for balance and below 80 for functionality
/mob/living/carbon/proc/reduce_fullness(amount, notify = TRUE) // fullness_amount should be between 5 and 20 for balance and below 80 for functionality
if(!ishuman(src))
return
return
if(fullness >= FULLNESS_LEVEL_BLOATED && fullness_reducion_timer + FULLNESS_REDUCTION_COOLDOWN < world.time)
fullness -= amount // Remove Fullness
if(!notify)
if(!notify)
return
if(amount <= 5)
GainStation13/code/modules/research/designs/autolathe.dm
+1 -1
View File
@@ -2,6 +2,6 @@
name = "Fatness Infrared Emitter"
id = "fatness_infrared_emitter"
build_type = AUTOLATHE
materials = list(MAT_METAL = 1000, MAT_GLASS = 500)
materials = list(/datum/material/iron = 1000, /datum/material/glass = 500)
build_path = /obj/item/assembly/infra/fat
category = list("initial", "Misc")
GainStation13/code/modules/research/designs/nutri_designs.dm
+16 -16
View File
@@ -8,7 +8,7 @@
name = "Basic Fatoray"
id = "fatoray_weak"
build_type = PROTOLATHE
materials = list(MAT_METAL = 8000, MAT_GLASS = 6000, MAT_CALORITE = 10000)
materials = list(/datum/material/iron = 8000, /datum/material/glass = 6000, /datum/material/calorite = 10000)
construction_time = 75
build_path = /obj/item/gun/energy/fatoray/weak
category = list("Weapons")
@@ -18,7 +18,7 @@
name = "Basic Cannonshot Fatoray"
id = "fatoray_cannon_weak"
build_type = PROTOLATHE
materials = list(MAT_METAL = 10000, MAT_GLASS = 8000, MAT_CALORITE = 20000)
materials = list(/datum/material/iron = 10000, /datum/material/glass = 8000, /datum/material/calorite = 20000)
construction_time = 200
build_path = /obj/item/gun/energy/fatoray/cannon_weak
category = list("Weapons")
@@ -28,7 +28,7 @@
name = "AL-T-Ray: Metabolism"
id = "alter_ray_metabolism"
build_type = PROTOLATHE
materials = list(MAT_METAL = 10000, MAT_GLASS = 8000, MAT_CALORITE = 26000)
materials = list(/datum/material/iron = 10000, /datum/material/glass = 8000, /datum/material/calorite = 26000)
construction_time = 200
build_path = /obj/item/gun/energy/laser/alter_ray/gainrate
category = list("Weapons")
@@ -39,7 +39,7 @@
name = "AL-T-Ray: Reverser"
id = "alter_ray_reverser"
build_type = PROTOLATHE
materials = list(MAT_METAL = 10000, MAT_GLASS = 8000, MAT_CALORITE = 26000)
materials = list(/datum/material/iron = 10000, /datum/material/glass = 8000, /datum/material/calorite = 26000)
construction_time = 200
build_path = /obj/item/gun/energy/laser/alter_ray/noloss
category = list("Weapons")
@@ -51,7 +51,7 @@
desc = "A collar that amplifies caloric intake of the wearer."
id = "calorite_collar"
build_type = PROTOLATHE
materials = list(MAT_METAL = 1000, MAT_CALORITE = 4000)
materials = list(/datum/material/iron = 1000, /datum/material/calorite = 4000)
construction_time = 75
build_path = /obj/item/clothing/neck/petcollar/calorite
category = list("Equipment", "Misc", "Medical Designs")
@@ -63,7 +63,7 @@
id = "ci-nutrimentturbo"
build_type = PROTOLATHE | MECHFAB
construction_time = 100
materials = list(MAT_METAL = 800, MAT_GLASS = 800, MAT_GOLD = 750, MAT_URANIUM = 1000)
materials = list(/datum/material/iron = 800, /datum/material/glass = 800, /datum/material/gold = 750, /datum/material/uranium = 1000)
build_path = /obj/item/organ/cyberimp/chest/nutriment/turbo
category = list("Misc", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
@@ -74,7 +74,7 @@
id = "ci-fatmobility"
build_type = PROTOLATHE | MECHFAB
construction_time = 100
materials = list(MAT_METAL = 800, MAT_GLASS = 800, MAT_GOLD = 750, MAT_URANIUM = 1000)
materials = list(/datum/material/iron = 800, /datum/material/glass = 800, /datum/material/gold = 750, /datum/material/uranium = 1000)
build_path = /obj/item/organ/cyberimp/chest/mobility
category = list("Misc", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
@@ -85,7 +85,7 @@
id = "bluespace_belt"
build_type = PROTOLATHE
construction_time = 100
materials = list(MAT_SILVER = 4000, MAT_GOLD = 4000, MAT_BLUESPACE = 2000, )
materials = list(/datum/material/silver = 4000, /datum/material/gold = 4000, MAT_BLUESPACE = 2000, )
build_path = /obj/item/bluespace_belt
category = list("Misc", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
@@ -96,7 +96,7 @@
id = "cookie_synthesizer"
build_type = PROTOLATHE
construction_time = 100
materials = list(MAT_SILVER = 4000, MAT_URANIUM = 1000, MAT_BLUESPACE = 1000, MAT_CALORITE = 2000)
materials = list(/datum/material/silver = 4000, /datum/material/uranium = 1000, MAT_BLUESPACE = 1000, /datum/material/calorite = 2000)
build_path = /obj/item/cookiesynth
category = list("Misc", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_SCIENCE | DEPARTMENTAL_FLAG_SERVICE
@@ -107,7 +107,7 @@
id = "borg_upgrade_cookiesynthesizer"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/cookiesynth
materials = list(MAT_METAL=10000, MAT_GOLD=1500, MAT_URANIUM=250, MAT_PLASMA=1500)
materials = list(/datum/material/iron=10000, /datum/material/gold=1500, /datum/material/uranium=250, MAT_PLASMA=1500)
construction_time = 100
category = list("Cyborg Upgrade Modules")
@@ -116,7 +116,7 @@
id = "borg_upgrade_fatoray"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/fatoray
materials = list(MAT_METAL = 8000, MAT_GLASS = 6000, MAT_CALORITE = 10000)
materials = list(/datum/material/iron = 8000, /datum/material/glass = 6000, /datum/material/calorite = 10000)
construction_time = 100
category = list("Cyborg Upgrade Modules")
@@ -125,7 +125,7 @@
id = "borg_upgrade_feedingtube"
build_type = MECHFAB
build_path = /obj/item/borg/upgrade/feedtube
materials = list(MAT_METAL = 8000, MAT_GLASS = 6000, MAT_CALORITE = 10000)
materials = list(/datum/material/iron = 8000, /datum/material/glass = 6000, /datum/material/calorite = 10000)
construction_time = 100
category = list("Cyborg Upgrade Modules")
@@ -138,7 +138,7 @@
/obj/item/borg/upgrade/cookiesynth/action(mob/living/silicon/robot/R, user = usr)
. = ..()
if(.)
if(.)
var/obj/item/cookiesynth/S = new(R.module)
R.module.basic_modules += S
R.module.add_module(S, FALSE, TRUE)
@@ -167,7 +167,7 @@
/obj/item/borg/upgrade/fatoray/action(mob/living/silicon/robot/R, user = usr)
. = ..()
if(.)
if(.)
var/obj/item/gun/energy/fatoray/weak/cyborg/S = new(R.module)
R.module.basic_modules += S
R.module.add_module(S, FALSE, TRUE)
@@ -203,7 +203,7 @@
if(!istype(M))
return
if(R.total_volume && M.can_inject(user, 1, user.zone_selected,bypass_protection))
if(M == user.pulling && ishuman(user.pulling))
starttime = world.time
while(starttime + 300 > world.time && in_range(user, M))
@@ -239,7 +239,7 @@
/obj/item/borg/upgrade/feedtube/action(mob/living/silicon/robot/R, user = usr)
. = ..()
if(.)
if(.)
var/obj/item/reagent_containers/borghypo/feeding_tube/S = new(R.module)
R.module.basic_modules += S
R.module.add_module(S, FALSE, TRUE)
GainStation13/code/modules/weapons/grenades.dm
+36
View File
@@ -0,0 +1,36 @@
//GS13 - fattening grenade presets
/obj/item/grenade/chem_grenade/lipoifier_strong
name = "lipoifier grenade"
desc = "For when you want everyone in the room to gain a couple hundred pounds."
/obj/item/grenade/chem_grenade/lipoifier_strong/Initialize(mapload)
. = ..()
var/obj/item/reagent_containers/glass/beaker/bluespace/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/bluespace/B2 = new(src)
B1.reagents.add_reagent(/datum/reagent/consumable/lipoifier, 250)
B1.reagents.add_reagent(/datum/reagent/potassium, 40)
B2.reagents.add_reagent(/datum/reagent/phosphorus, 40)
B2.reagents.add_reagent(/datum/reagent/consumable/sugar, 40)
beakers += B1
beakers += B2
/obj/item/grenade/chem_grenade/lipoifier_weak
name = "lipoifier grenade"
desc = "For when you want everyone in the room to gain a couple dozen pounds."
/obj/item/grenade/chem_grenade/lipoifier_weak/Initialize(mapload)
. = ..()
var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
B1.reagents.add_reagent(/datum/reagent/consumable/lipoifier, 40)
B1.reagents.add_reagent(/datum/reagent/potassium, 20)
B2.reagents.add_reagent(/datum/reagent/phosphorus, 20)
B2.reagents.add_reagent(/datum/reagent/consumable/sugar, 20)
beakers += B1
beakers += B2