mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-15 01:46:41 +01:00
Merge branch 'fatness-change-and-scales' of https://github.com/SomeGuyEatingPie/GS13 into fatness-change-and-scales
This commit is contained in:
SomeGuyEatingPie
@@ -94,7 +94,7 @@ SUBSYSTEM_DEF(vote)
|
||||
if(choices[GLOB.master_mode] >= greatest_votes)
|
||||
greatest_votes = choices[GLOB.master_mode]
|
||||
else if(mode == "transfer") // austation sort of but not really begin -- Crew autotransfer vote
|
||||
choices["Initiate Crew Transfer"] += non_voters.len
|
||||
//GS13 no more transfer autovote, finally!
|
||||
if(choices["Initiate Crew Transfer"] >= greatest_votes)
|
||||
greatest_votes = choices["Initiate Crew Transfer"]
|
||||
|
||||
|
||||
@@ -423,6 +423,10 @@
|
||||
suffix = "whiteship_pod"
|
||||
name = "Salvage Pod"
|
||||
|
||||
/datum/map_template/shuttle/whiteship/Sophie1
|
||||
suffix = "Sophie1"
|
||||
name = "Sophie's Ship"
|
||||
|
||||
/datum/map_template/shuttle/cargo/box
|
||||
suffix = "box"
|
||||
name = "supply shuttle (Box)"
|
||||
@@ -535,4 +539,4 @@
|
||||
|
||||
/datum/map_template/shuttle/snowdin/excavation
|
||||
suffix = "excavation"
|
||||
name = "Snowdin Excavation Elevator"
|
||||
name = "Snowdin Excavation Elevator"
|
||||
|
||||
@@ -187,3 +187,23 @@
|
||||
mob_trait = TRAIT_TRASHCAN
|
||||
category = CATEGORY_FOOD
|
||||
medical_record_text = "Patient has been observed eating inedable garbage."
|
||||
|
||||
/datum/quirk/universal_diet
|
||||
name = "Universal diet"
|
||||
desc = "You are fine with eating just about anything normally edible, you have no strong dislikes in food. Toxic food will still hurt you, though."
|
||||
value = 0
|
||||
category = CATEGORY_FOOD
|
||||
gain_text = "<span class='notice'>You feel like you can eat any food type.</span>"
|
||||
lose_text = "<span class='notice'>You start to dislike certain food types again.</span>"
|
||||
medical_record_text = "Patient reports no strong dietary dislikes."
|
||||
|
||||
/datum/quirk/universal_diet/add()
|
||||
var/mob/living/carbon/human/H = quirk_holder
|
||||
var/datum/species/species = H.dna.species
|
||||
species.disliked_food = null
|
||||
|
||||
/datum/quirk/universal_diet/remove()
|
||||
var/mob/living/carbon/human/H = quirk_holder
|
||||
if(H)
|
||||
var/datum/species/species = H.dna.species
|
||||
species.disliked_food = initial(species.disliked_food)
|
||||
@@ -93,6 +93,30 @@
|
||||
/area/shuttle/abandoned/pod
|
||||
name = "Abandoned Ship Pod"
|
||||
|
||||
/area/shuttle/Sophie
|
||||
name = "Sophie's Ship"
|
||||
blob_allowed = FALSE
|
||||
requires_power = TRUE
|
||||
canSmoothWithAreas = /area/shuttle/Sophie
|
||||
|
||||
/area/shuttle/Sophie/bridge
|
||||
name = "Sophie's Ship Bridge"
|
||||
|
||||
/area/shuttle/Sophie/engine
|
||||
name = "Sophie's Ship Engine"
|
||||
|
||||
/area/shuttle/Sophie/kitchen
|
||||
name = "Sophie's Ship kitchen"
|
||||
|
||||
/area/shuttle/Sophie/lounge
|
||||
name = "Sophie's Ship lounge"
|
||||
|
||||
/area/shuttle/Sophie/crew
|
||||
name = "Sophie's Ship Crew Quarters"
|
||||
|
||||
/area/shuttle/Sophie/medbay
|
||||
name = "Sophie's Ship Medbay"
|
||||
|
||||
////////////////////////////Single-area shuttles////////////////////////////
|
||||
|
||||
/area/shuttle/transit
|
||||
@@ -200,4 +224,4 @@
|
||||
name = "Tiny Freighter"
|
||||
|
||||
/area/shuttle/caravan/freighter3
|
||||
name = "Tiny Freighter"
|
||||
name = "Tiny Freighter"
|
||||
|
||||
@@ -104,9 +104,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
var/starting_weight = 0 //how thicc you wanna be at start
|
||||
|
||||
//HS13 jobs
|
||||
var/sillyroles = FALSE //for clown and mime
|
||||
var/roleplayroles = FALSE //for the roleplay roles
|
||||
var/importantroles = FALSE //for things that define as important.
|
||||
var/sillyroles = TRUE //for clown and mime
|
||||
var/roleplayroles = TRUE //for the roleplay roles
|
||||
var/importantroles = TRUE //for things that define as important.
|
||||
|
||||
|
||||
var/datum/species/pref_species = new /datum/species/human() //Mutant race
|
||||
@@ -2474,7 +2474,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
body_size = max(min( round(text2num(new_bodysize)), MAX_BODYSIZE),MIN_BODYSIZE)
|
||||
|
||||
//GS13 fatness
|
||||
|
||||
|
||||
if("fatness")
|
||||
var/new_fatness = input(user, "Choose your amount of fat at start :\n(0-2000), Fat changes appearance and move speed. \nThresholds are 100, 350, 650, 950 and 1671. Fair warning : being too fat will make you immobile", "Character Preference") as num|null
|
||||
if (new_fatness)
|
||||
|
||||
@@ -126,3 +126,34 @@
|
||||
head = /obj/item/clothing/head/helmet/space/plasmaman/clown
|
||||
uniform = /obj/item/clothing/under/plasmaman/clown
|
||||
mask = /obj/item/clothing/mask/gas/clown_hat
|
||||
|
||||
/datum/outfit/plasmaman/captain
|
||||
name = "Plasmaman Captain"
|
||||
head = /obj/item/clothing/head/helmet/space/plasmaman/captain
|
||||
uniform = /obj/item/clothing/under/plasmaman/captain
|
||||
|
||||
/datum/outfit/plasmaman/hop
|
||||
name = "Plasmaman Head of Personnel"
|
||||
head = /obj/item/clothing/head/helmet/space/plasmaman/hop
|
||||
uniform = /obj/item/clothing/under/plasmaman/hop
|
||||
|
||||
/datum/outfit/plasmaman/ce
|
||||
name = "Plasmaman Chief Engineer"
|
||||
head = /obj/item/clothing/head/helmet/space/plasmaman/ce
|
||||
uniform = /obj/item/clothing/under/plasmaman/ce
|
||||
|
||||
/datum/outfit/plasmaman/cmo
|
||||
name = "Plasmaman Chief Medical Officer"
|
||||
head = /obj/item/clothing/head/helmet/space/plasmaman/cmo
|
||||
uniform = /obj/item/clothing/under/plasmaman/cmo
|
||||
|
||||
/datum/outfit/plasmaman/rd
|
||||
name = "Plasmaman Research Director"
|
||||
head = /obj/item/clothing/head/helmet/space/plasmaman/rd
|
||||
uniform = /obj/item/clothing/under/plasmaman/rd
|
||||
|
||||
/datum/outfit/plasmaman/hos
|
||||
name = "Plasmaman Head of Security"
|
||||
head = /obj/item/clothing/head/helmet/space/plasmaman/hos
|
||||
uniform = /obj/item/clothing/under/plasmaman/hos
|
||||
|
||||
|
||||
@@ -267,4 +267,46 @@
|
||||
icon_state = "clown_envirohelm"
|
||||
item_state = "clown_envirohelm"
|
||||
visor_icon = "clown_envisor"
|
||||
smile_state = "clown_smile"
|
||||
smile_state = "clown_smile"
|
||||
|
||||
/obj/item/clothing/head/helmet/space/plasmaman/captain
|
||||
name = "captain envirosuit helmet"
|
||||
desc = "A blue and gold envirosuit helmet designed only for the most important plasmaman on board."
|
||||
icon_state = "captain_envirohelm"
|
||||
item_state = "captain_envirohelm"
|
||||
armor = list("melee" = 40, "bullet" = 50, "laser" = 50, "energy" = 25, "bomb" = 50, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75)
|
||||
|
||||
/obj/item/clothing/head/helmet/space/plasmaman/hop
|
||||
name = "head of personnel envirosuit helmet"
|
||||
desc = "A blue envirosuit helmet with red details. The plasma bureaucrat's helmet of choice. Not that he has much choice, anyway."
|
||||
icon_state = "hop_envirohelm"
|
||||
item_state = "hop_envirohelm"
|
||||
|
||||
/obj/item/clothing/head/helmet/space/plasmaman/ce
|
||||
name = "chief engineer envirosuit helmet"
|
||||
desc = "A durable yellow and white envirosuit helmet with green stripes. It reflects lights for high visibility of the wearer. The Chief Engineer must stand out, after all."
|
||||
icon_state = "ce_envirohelm"
|
||||
item_state = "ce_envirohelm"
|
||||
armor = list("melee" = 40, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 50, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 90)
|
||||
|
||||
/obj/item/clothing/head/helmet/space/plasmaman/cmo
|
||||
name = "chief medical officer envirosuit helmet"
|
||||
desc = "A light blue envirosuit helmet with white stripes. It looks very clean. Let the plasma bring health to those who need it (the healing, not plasma)."
|
||||
icon_state = "cmo_envirohelm"
|
||||
item_state = "cmo_envirohelm"
|
||||
armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 10, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75)
|
||||
|
||||
/obj/item/clothing/head/helmet/space/plasmaman/rd
|
||||
name = "research director envirosuit helmet"
|
||||
desc = "An envirosuit helmet with a bizarrely unfitting black and white coloration. Has extended cranium space for the biggest egghead on board."
|
||||
icon_state = "rd_envirohelm"
|
||||
item_state = "rd_envirohelm"
|
||||
visor_icon = "rd_envisor"
|
||||
armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 5, "bomb" = 100, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 80)
|
||||
|
||||
/obj/item/clothing/head/helmet/space/plasmaman/hos
|
||||
name = "head of security envirosuit helmet"
|
||||
desc = "A red and black envirosuit helmet with golden stripes. It is well-armored. All must bow before the Purple Skeleton of Law."
|
||||
icon_state = "hos_envirohelm"
|
||||
item_state = "hos_envirohelm"
|
||||
armor = list("melee" = 45, "bullet" = 25, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 95)
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
/obj/item/clothing/under/plasmaman/captain
|
||||
name = "captain plasma envirosuit"
|
||||
desc = "A blue and gold envirosuit designed only for the most important plasmaman on board."
|
||||
icon_state = "captain_envirosuit"
|
||||
item_state = "captain_envirosuit"
|
||||
item_color = "captain_envirosuit"
|
||||
armor = list("melee" = 10, "bullet" = 10, "laser" = 10,"energy" = 10, "bomb" = 10, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75)
|
||||
|
||||
/obj/item/clothing/under/plasmaman/hop
|
||||
name = "head of personnel plasma envirosuit"
|
||||
desc = "A blue envirosuit with red details and a snazzy imitation collar. The plasma bureaurcrat's outfit of choice. Not that he has much choice, anyway."
|
||||
icon_state = "hop_envirosuit"
|
||||
item_state = "hop_envirosuit"
|
||||
item_color = "hop_envirosuit"
|
||||
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75)
|
||||
|
||||
/obj/item/clothing/under/plasmaman/ce
|
||||
name = "chief engineer plasma envirosuit"
|
||||
desc = "A durable envirosuit with a highly reflective surface. Stand out from the working crowd, skeleton."
|
||||
icon_state = "ce_envirosuit"
|
||||
item_state = "ce_envirosuit"
|
||||
item_color = "ce_envirosuit"
|
||||
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75)
|
||||
|
||||
/obj/item/clothing/under/plasmaman/cmo
|
||||
name = "chief medical officer plasma envirosuit"
|
||||
desc = "A light blue and white envirosuit with a big white reflective cross on the chest. Here to save your lives and breath some plasma."
|
||||
icon_state = "cmo_envirosuit"
|
||||
item_state = "cmo_envirosuit"
|
||||
item_color = "cmo_envirosuit"
|
||||
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75)
|
||||
|
||||
/obj/item/clothing/under/plasmaman/rd
|
||||
name = "research director plasma envirosuit"
|
||||
desc = "A snazzy brown envirosuit imitating the uniform of a less boney-phoroney Research Director. For the king of plasma and science."
|
||||
icon_state = "rd_envirosuit"
|
||||
item_state = "rd_envirosuit"
|
||||
item_color = "rd_envirosuit"
|
||||
armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 10, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75)
|
||||
|
||||
/obj/item/clothing/under/plasmaman/hos
|
||||
name = "head of security plasma envirosuit"
|
||||
desc = "A crimson red envirosuit with black and gold details. For a real law revenant."
|
||||
icon_state = "hos_envirosuit"
|
||||
item_state = "hos_envirosuit"
|
||||
item_color = "hos_envirosuit"
|
||||
armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 0, "bio" = 100, "rad" = 0, "fire" = 100, "acid" = 75)
|
||||
@@ -119,6 +119,24 @@
|
||||
if("Clown")
|
||||
O = new /datum/outfit/plasmaman/clown
|
||||
|
||||
if("Captain")
|
||||
O = new /datum/outfit/plasmaman/captain
|
||||
|
||||
if("Head of Personnel")
|
||||
O = new /datum/outfit/plasmaman/hop
|
||||
|
||||
if("Chief Engineer")
|
||||
O = new /datum/outfit/plasmaman/ce
|
||||
|
||||
if("Chief Medical Officer")
|
||||
O = new /datum/outfit/plasmaman/cmo
|
||||
|
||||
if("Research Director")
|
||||
O = new /datum/outfit/plasmaman/rd
|
||||
|
||||
if("Head of Security")
|
||||
O = new /datum/outfit/plasmaman/hos
|
||||
|
||||
H.equipOutfit(O, visualsOnly)
|
||||
H.internal = H.get_item_for_held_index(2)
|
||||
H.update_internals_hud_icon(1)
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
// may result.
|
||||
if(force)
|
||||
..()
|
||||
. = QDEL_HINT_QUEUE
|
||||
return QDEL_HINT_QUEUE
|
||||
else
|
||||
return QDEL_HINT_LETMELIVE
|
||||
|
||||
@@ -227,6 +227,28 @@
|
||||
reserved_area = null
|
||||
return ..()
|
||||
|
||||
/obj/docking_port/stationary/picked
|
||||
///Holds a list of map name strings for the port to pick from
|
||||
var/list/shuttlekeys
|
||||
|
||||
/obj/docking_port/stationary/picked/Initialize(mapload)
|
||||
. = ..()
|
||||
if(!LAZYLEN(shuttlekeys))
|
||||
WARNING("Random docking port [id] loaded with no shuttle keys")
|
||||
return
|
||||
var/selectedid = pick(shuttlekeys)
|
||||
roundstart_template = SSmapping.shuttle_templates[selectedid]
|
||||
|
||||
/obj/docking_port/stationary/picked/whiteship
|
||||
name = "Deep Space"
|
||||
id = "whiteship_away"
|
||||
dheight = 0
|
||||
dir = 2
|
||||
dwidth = 11
|
||||
height = 22
|
||||
width = 35
|
||||
shuttlekeys = list("whiteship_meta", "whiteship_pubby", "whiteship_box", "whiteship_cere", "whiteship_kilo", "whiteship_donut", "whiteship_delta", "whiteship_Sophie1")
|
||||
|
||||
/obj/docking_port/mobile
|
||||
name = "shuttle"
|
||||
icon_state = "pinonclose"
|
||||
|
||||
@@ -54,3 +54,8 @@
|
||||
loot = list(/obj/mecha/working/ripley/mining = 1,
|
||||
/obj/structure/mecha_wreckage/ripley = 5)
|
||||
lootdoubles = FALSE
|
||||
|
||||
/obj/item/paper/fluff/ruins/sophie
|
||||
name = "Handwritten note"
|
||||
|
||||
info = "Hello, if you are reading this, you've must have come across my ship.<br>You're welcome to borrow it to get about if its an emergency. Just plase dont leave it an mess.<br> - Sophie Johnson (HoP of General Station 13)"
|
||||
|
||||
Reference in New Issue
Block a user