mirror of
https://github.com/KabKebab/GS13.git
synced 2026-07-09 23:21:02 +01:00
Merge branch 'evilew:master' into master
This commit is contained in:
Alphas00
@@ -155,13 +155,13 @@
|
||||
/// How much credits do we currently have?
|
||||
var/credits = 0
|
||||
/// How many credits are we going to reward per pound gained?
|
||||
var/credits_per_fatness = 1
|
||||
var/credits_per_fatness = 0.25
|
||||
/// A list containing all of the people we've scanned and their maximum weight.
|
||||
var/list/scanned_people = list()
|
||||
/// What is the current team number?
|
||||
var/team_number = 27
|
||||
/// What is the maximum ammount of credits that can be gained per person?
|
||||
var/maximum_credits = 900 // A little bit over the fattness for blob.
|
||||
var/maximum_credits = 1000 // A little bit over the fattness for blob.
|
||||
|
||||
/obj/structure/scale/credits/Initialize(mapload)
|
||||
..()
|
||||
@@ -191,14 +191,20 @@
|
||||
var/credits_to_add = min((fatty.fatness * credits_per_fatness), maximum_credits)
|
||||
var/credits_to_remove = 0
|
||||
if(scanned_people[fatty])
|
||||
if(scanned_people[fatty] >= maximum_credits)
|
||||
return TRUE
|
||||
|
||||
credits_to_remove = scanned_people[fatty]
|
||||
else
|
||||
scanned_people[fatty] = 0
|
||||
|
||||
var/credit_total = max((credits_to_add - credits_to_remove), 0)
|
||||
if(credit_total > 0)
|
||||
say("[credit_total] credits have been deposited into the console.")
|
||||
|
||||
credits += credit_total
|
||||
scanned_people[fatty] = max(credit_total, credits_to_remove)
|
||||
scanned_people[fatty] += credit_total
|
||||
|
||||
return TRUE
|
||||
|
||||
/obj/machinery/abductor/pad/feeder
|
||||
|
||||
@@ -23,6 +23,11 @@
|
||||
credit_cost = 150
|
||||
item_to_dispense = /obj/item/autosurgeon/nutripump_turbo
|
||||
|
||||
/datum/feeders_den_goodie/nutripump_turbo
|
||||
name = "Mobility Nanite Core Autosurgeon"
|
||||
credit_cost = 400
|
||||
item_to_dispense = /obj/item/autosurgeon/fat_mobility
|
||||
|
||||
/datum/feeders_den_goodie/fatbeam_gun
|
||||
name = "Fatbeam gun"
|
||||
credit_cost = 400
|
||||
|
||||
@@ -25,8 +25,9 @@ GLOBAL_LIST_INIT(uncapped_resize_areas, list(/area/bridge, /area/crew_quarters,
|
||||
*
|
||||
* * adjustment_amount - adjusts how much weight is gained or loss. Positive numbers add weight.
|
||||
* * type_of_fattening - what type of fattening is being used. Look at the traits in fatness.dm for valid options.
|
||||
* * ignore_rate - do we want to ignore the mob's weight gain/loss rate? This is only here for niche uses.
|
||||
*/
|
||||
/mob/living/carbon/proc/adjust_fatness(adjustment_amount, type_of_fattening = FATTENING_TYPE_ITEM)
|
||||
/mob/living/carbon/proc/adjust_fatness(adjustment_amount, type_of_fattening = FATTENING_TYPE_ITEM, ignore_rate = FALSE)
|
||||
if(!adjustment_amount || !type_of_fattening)
|
||||
return FALSE
|
||||
|
||||
@@ -35,10 +36,11 @@ GLOBAL_LIST_INIT(uncapped_resize_areas, list(/area/bridge, /area/crew_quarters,
|
||||
return FALSE
|
||||
|
||||
var/amount_to_change = adjustment_amount
|
||||
if(adjustment_amount > 0)
|
||||
amount_to_change = amount_to_change * weight_gain_rate
|
||||
else
|
||||
amount_to_change = amount_to_change * weight_loss_rate
|
||||
if(!ignore_rate)
|
||||
if(adjustment_amount > 0)
|
||||
amount_to_change = amount_to_change * weight_gain_rate
|
||||
else
|
||||
amount_to_change = amount_to_change * weight_loss_rate
|
||||
|
||||
fatness_real += amount_to_change
|
||||
fatness_real = max(fatness_real, MINIMUM_FATNESS_LEVEL) //It would be a little silly if someone got negative fat.
|
||||
@@ -204,3 +206,34 @@ GLOBAL_LIST_INIT(uncapped_resize_areas, list(/area/bridge, /area/crew_quarters,
|
||||
return "Immobile"
|
||||
|
||||
return "Blob"
|
||||
|
||||
/// Finds what the next fatness level for the parent mob would be based off of fatness_real.
|
||||
/mob/living/carbon/proc/get_next_fatness_level()
|
||||
if(fatness_real < FATNESS_LEVEL_FAT)
|
||||
return FATNESS_LEVEL_FAT
|
||||
if(fatness_real < FATNESS_LEVEL_FATTER)
|
||||
return FATNESS_LEVEL_FATTER
|
||||
if(fatness_real < FATNESS_LEVEL_VERYFAT)
|
||||
return FATNESS_LEVEL_VERYFAT
|
||||
if(fatness_real < FATNESS_LEVEL_OBESE)
|
||||
return FATNESS_LEVEL_OBESE
|
||||
if(fatness_real < FATNESS_LEVEL_MORBIDLY_OBESE)
|
||||
return FATNESS_LEVEL_MORBIDLY_OBESE
|
||||
if(fatness_real < FATNESS_LEVEL_EXTREMELY_OBESE)
|
||||
return FATNESS_LEVEL_EXTREMELY_OBESE
|
||||
if(fatness_real < FATNESS_LEVEL_BARELYMOBILE)
|
||||
return FATNESS_LEVEL_BARELYMOBILE
|
||||
if(fatness_real < FATNESS_LEVEL_IMMOBILE)
|
||||
return FATNESS_LEVEL_IMMOBILE
|
||||
if(fatness_real < FATNESS_LEVEL_BLOB)
|
||||
return FATNESS_LEVEL_BLOB
|
||||
|
||||
return FATNESS_LEVEL_BLOB
|
||||
|
||||
/// How much real fatness does the current mob have to gain until they reach the next level? Return FALSE if they are maxed out.
|
||||
/mob/living/carbon/proc/fatness_until_next_level()
|
||||
var/needed_fatness = get_next_fatness_level() - fatness_real
|
||||
needed_fatness = max(needed_fatness, 0)
|
||||
|
||||
return needed_fatness
|
||||
|
||||
|
||||
@@ -68,6 +68,17 @@
|
||||
category = list("Misc", "Medical Designs")
|
||||
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
|
||||
|
||||
/datum/design/cyberimp_fat_mobility
|
||||
name = "Mobility Nanite Core"
|
||||
desc = "This implant contains nanites that reinforce leg muscles, allowing for unimpeded movement at extreme weights."
|
||||
id = "ci-fatmobility"
|
||||
build_type = PROTOLATHE | MECHFAB
|
||||
construction_time = 100
|
||||
materials = list(MAT_METAL = 800, MAT_GLASS = 800, MAT_GOLD = 750, MAT_URANIUM = 1000)
|
||||
build_path = /obj/item/organ/cyberimp/chest/mobility
|
||||
category = list("Misc", "Medical Designs")
|
||||
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
|
||||
|
||||
/datum/design/bluespace_belt
|
||||
name = "Bluespace Belt"
|
||||
desc = "A belt made using bluespace technology. The power of space and time, used to hide the fact you are fat."
|
||||
|
||||
@@ -5,7 +5,7 @@
|
||||
display_name = "Nutri-Tech Tools"
|
||||
description = "Ending world hunger was never made easier!"
|
||||
prereq_ids = list("biotech", "adv_engi")
|
||||
design_ids = list("calorite_collar", "ci-nutrimentturbo", "bluespace_belt", "adipoelectric_transformer", "cookie_synthesizer", "borg_upgrade_cookiesynthesizer", "borg_upgrade_feedingtube")
|
||||
design_ids = list("calorite_collar", "ci-nutrimentturbo", "bluespace_belt", "adipoelectric_transformer", "cookie_synthesizer", "borg_upgrade_cookiesynthesizer", "borg_upgrade_feedingtube", "ci-fatmobility")
|
||||
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
|
||||
boost_item_paths = list(/obj/item/gun/energy/fatoray, /obj/item/gun/energy/fatoray/cannon, /obj/item/trash/fatoray_scrap1, /obj/item/trash/fatoray_scrap2)
|
||||
export_price = 5000
|
||||
|
||||
@@ -9,3 +9,17 @@
|
||||
hunger_threshold = NUTRITION_LEVEL_FULL
|
||||
poison_amount = 10
|
||||
message = "" //no message cuz spam is annoying
|
||||
|
||||
/obj/item/organ/cyberimp/chest/mobility
|
||||
name = "Mobility Nanite Core"
|
||||
desc = "This implant contains nanites that reinforce leg muscles, allowing for unimpeded movement at extreme weights."
|
||||
icon_state = "chest_implant"
|
||||
implant_color = "#9034db"
|
||||
|
||||
/obj/item/organ/cyberimp/chest/mobility/Insert(mob/living/carbon/M, special = 0)
|
||||
..()
|
||||
ADD_TRAIT(M, TRAIT_NO_FAT_SLOWDOWN, src)
|
||||
|
||||
/obj/item/organ/cyberimp/chest/mobility/Remove(mob/living/carbon/M, special = 0)
|
||||
REMOVE_TRAIT(M, TRAIT_NO_FAT_SLOWDOWN, src)
|
||||
..()
|
||||
|
||||
@@ -67,6 +67,11 @@
|
||||
uses = 1
|
||||
starting_organ = /obj/item/organ/cyberimp/chest/nutriment/turbo
|
||||
|
||||
/obj/item/autosurgeon/fat_mobility
|
||||
desc = "A single use autosurgeon that contains a mobility nanite core. A screwdriver can be used to remove it, but implants can't be placed back in."
|
||||
uses = 1
|
||||
starting_organ = /obj/item/organ/cyberimp/chest/mobility
|
||||
|
||||
//fast food restaurant - closed / open signs
|
||||
/obj/item/holosign_creator/restaurant
|
||||
name = "Holosign Projector - Restaurant Adverts"
|
||||
|
||||
@@ -0,0 +1,25 @@
|
||||
/obj/item/gun/energy/kinetic_accelerator/crossbow/feeder
|
||||
name = "feeder's mini energy crossbow"
|
||||
desc = "a modified version of the standard mini energy crossbow, designed to fatten up a target while incapacitating them."
|
||||
icon_state = "crossbow_halloween"
|
||||
item_state = "crossbow"
|
||||
ammo_type = list(/obj/item/ammo_casing/energy/bolt/fattening)
|
||||
|
||||
/obj/item/ammo_casing/energy/bolt/fattening
|
||||
projectile_type = /obj/item/projectile/energy/bolt/fattening
|
||||
|
||||
/obj/item/projectile/energy/bolt/fattening
|
||||
damage = 0
|
||||
|
||||
/obj/item/projectile/energy/bolt/fattening/Initialize()
|
||||
. = ..()
|
||||
|
||||
/obj/item/projectile/energy/bolt/fattening/on_hit(atom/target, blocked)
|
||||
. = ..()
|
||||
var/mob/living/carbon/target_mob = target
|
||||
if(!istype(target_mob) || (blocked == 100))
|
||||
return
|
||||
|
||||
target_mob.reagents.add_reagent(/datum/reagent/consumable/lipoifier, 2)
|
||||
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
/obj/structure/fat_mirror
|
||||
name = "mirror" //Exact same text. Good luck.
|
||||
desc = "Mirror mirror on the wall, who's the most robust of them all?"
|
||||
icon = 'icons/obj/watercloset.dmi'
|
||||
icon_state = "mirror"
|
||||
density = FALSE
|
||||
anchored = TRUE
|
||||
/// Does the item delete itself after being "used?"
|
||||
var/single_use = TRUE
|
||||
|
||||
/obj/structure/fat_mirror/attack_hand(mob/user)
|
||||
. = ..()
|
||||
if(.)
|
||||
return
|
||||
|
||||
var/mob/living/carbon/looker = user
|
||||
if(!istype(looker) || !Adjacent(looker))
|
||||
return
|
||||
|
||||
make_fat(looker)
|
||||
return TRUE
|
||||
|
||||
/obj/structure/fat_mirror/proc/make_fat(mob/living/carbon/looker)
|
||||
if(!istype(looker) || !looker.check_weight_prefs(FATTENING_TYPE_MAGIC))
|
||||
return FALSE
|
||||
|
||||
var/fat_to_add = looker.fatness_until_next_level()
|
||||
if(!fat_to_add)
|
||||
fat_to_add = FATNESS_LEVEL_BLOB // If someone is a blob, just add the amount of fatness needed to be a blob in the first place.
|
||||
|
||||
fat_to_add += 25 // a little buffer so they don't instantly burn it off.
|
||||
looker.adjust_fatness(fat_to_add, FATTENING_TYPE_MAGIC, TRUE)
|
||||
to_chat(looker, span_warning("Taking a look in the mirror, you look fatter than you remeber being."))
|
||||
|
||||
if(single_use)
|
||||
visible_message(span_warning("[src] shatters into pieces."))
|
||||
qdel(src)
|
||||
|
||||
|
||||
+2930
-2158
File diff suppressed because it is too large
Load Diff
@@ -95,8 +95,9 @@
|
||||
#define ACCESS_AWAY_ENGINE 204//Away engineering
|
||||
#define ACCESS_AWAY_ALL 205 //Away All Access
|
||||
#define ACCESS_AWAY_BOTANY 206 //Away Botany Access
|
||||
#define ACCESS_AWAY_GENERIC3 207
|
||||
#define ACCESS_AWAY_GENERIC4 208
|
||||
#define ACCESS_AWAY_SCIENCE 207 //Away Science Access
|
||||
#define ACCESS_AWAY_GENERIC3 208 //Had to leave this one because for some reason it's getting used
|
||||
#define ACCESS_AWAY_EXPLORE 209 //Away Explorer Access
|
||||
|
||||
//Special, for anything that's basically internal
|
||||
#define ACCESS_BLOODCULT 250
|
||||
|
||||
@@ -0,0 +1,141 @@
|
||||
// Sorted alphabetically
|
||||
#define span_abductor(str) ("<span class='abductor'>" + str + "</span>")
|
||||
#define span_admin(str) ("<span class='admin'>" + str + "</span>")
|
||||
#define span_adminhelp(str) ("<span class='adminhelp'>" + str + "</span>")
|
||||
#define span_adminnotice(str) ("<span class='adminnotice'>" + str + "</span>")
|
||||
#define span_adminobserverooc(str) ("<span class='adminobserverooc'>" + str + "</span>")
|
||||
#define span_adminooc(str) ("<span class='adminooc'>" + str + "</span>")
|
||||
#define span_adminsay(str) ("<span class='adminsay'>" + str + "</span>")
|
||||
#define span_aiprivradio(str) ("<span class='aiprivradio'>" + str + "</span>")
|
||||
#define span_alert(str) ("<span class='alert'>" + str + "</span>")
|
||||
#define span_alertalien(str) ("<span class='alertalien'>" + str + "</span>")
|
||||
#define span_alertsyndie(str) ("<span class='alertsyndie'>" + str + "</span>")
|
||||
#define span_alertwarning(str) ("<span class='alertwarning'>" + str + "</span>")
|
||||
#define span_alien(str) ("<span class='alien'>" + str + "</span>")
|
||||
#define span_announce(str) ("<span class='announce'>" + str + "</span>")
|
||||
#define span_announcement_header(str) ("<span class='announcement_header'>" + str + "</span>")
|
||||
#define span_average(str) ("<span class='average'" + str + "</span")
|
||||
#define span_bad(str) ("<span class='bad'" + str + "</span")
|
||||
#define span_big(str) ("<span class='big'>" + str + "</span>")
|
||||
#define span_bigicon(str) ("<span class='bigicon'>" + str + "</span>")
|
||||
#define span_binarysay(str) ("<span class='binarysay'>" + str + "</span>")
|
||||
#define span_blob(str) ("<span class='blob'>" + str + "</span>")
|
||||
#define span_blobannounce(str) ("<span class='blobannounce'>" + str + "</span>")
|
||||
#define span_blue(str) ("<span class='blue'>" + str + "</span>")
|
||||
#define span_blueteamradio(str) ("<span class='blueteamradio'>" + str + "</span>")
|
||||
#define span_bold(str) ("<span class='bold'>" + str + "</span>")
|
||||
#define span_boldannounce(str) ("<span class='boldannounce'>" + str + "</span>")
|
||||
#define span_bolddanger(str) ("<span class='bolddanger'>" + str + "</span>")
|
||||
#define span_bolditalic(str) ("<span class='bolditalic'>" + str + "</span>")
|
||||
#define span_boldnicegreen(str) ("<span class='boldnicegreen'>" + str + "</span>")
|
||||
#define span_boldnotice(str) ("<span class='boldnotice'>" + str + "</span>")
|
||||
#define span_boldwarning(str) ("<span class='boldwarning'>" + str + "</span>")
|
||||
#define span_boldbig(str) ("<span class='big bold'>" + str + "</span>")
|
||||
#define span_centcomradio(str) ("<span class='centcomradio'>" + str + "</span>")
|
||||
#define span_changeling(str) ("<span class='changeling'>" + str + "</span>")
|
||||
#define span_clown(str) ("<span class='clown'>" + str + "</span>")
|
||||
#define span_colossus(str) ("<span class='colossus'>" + str + "</span>")
|
||||
#define span_command_headset(str) ("<span class='command_headset'>" + str + "</span>")
|
||||
#define span_comradio(str) ("<span class='comradio'>" + str + "</span>")
|
||||
#define span_cult(str) ("<span class='cult'>" + str + "</span>")
|
||||
#define span_cult_bold(str) ("<span class='cult_bold'>" + str + "</span>")
|
||||
#define span_cult_bold_italic(str) ("<span class='cult_bold_italic'>" + str + "</span>")
|
||||
#define span_cult_italic(str) ("<span class='cult_italic'>" + str + "</span>")
|
||||
#define span_cult_large(str) ("<span class='cult_large'>" + str + "</span>")
|
||||
#define span_danger(str) ("<span class='danger'>" + str + "</span>")
|
||||
#define span_deadsay(str) ("<span class='deadsay'>" + str + "</span>")
|
||||
#define span_deconversion_message(str) ("<span class='deconversion_message'>" + str + "</span>")
|
||||
#define span_drone(str) ("<span class='drone'>" + str + "</span>")
|
||||
#define span_engradio(str) ("<span class='engradio'>" + str + "</span>")
|
||||
#define span_extremelybig(str) ("<span class='extremelybig'>" + str + "</span>")
|
||||
#define span_game_say(str) ("<span class='game say'>" + str + "</span>")
|
||||
#define span_ghostalert(str) ("<span class='ghostalert'>" + str + "</span>")
|
||||
#define span_green(str) ("<span class='green'>" + str + "</span>")
|
||||
#define span_greenannounce(str) ("<span class='greenannounce'>" + str + "</span>")
|
||||
#define span_greenteamradio(str) ("<span class='greenteamradio'>" + str + "</span>")
|
||||
#define span_greentext(str) ("<span class='greentext'>" + str + "</span>")
|
||||
#define span_grey(str) ("<span class='grey'>" + str + "</span>")
|
||||
#define span_header(str) ("<span class='header'>" + str + "</span>")
|
||||
#define span_hear(str) ("<span class='hear'>" + str + "</span>")
|
||||
#define span_hidden(str) ("<span class='hidden'>" + str + "</span>")
|
||||
#define span_hierophant(str) ("<span class='hierophant'>" + str + "</span>")
|
||||
#define span_hierophant_warning(str) ("<span class='hierophant_warning'>" + str + "</span>")
|
||||
#define span_highlight(str) ("<span class='highlight'>" + str + "</span>")
|
||||
#define span_his_grace(str) ("<span class='his_grace'>" + str + "</span>")
|
||||
#define span_holoparasite(str) ("<span class='holoparasite'>" + str + "</span>")
|
||||
#define span_boldholoparasite(str) ("<span class='holoparasite bold'>" + str + "</span>")
|
||||
#define span_hypnophrase(str) ("<span class='hypnophrase'>" + str + "</span>")
|
||||
#define span_icon(str) ("<span class='icon'>" + str + "</span>")
|
||||
#define span_info(str) ("<span class='info'>" + str + "</span>")
|
||||
#define span_infoplain(str) ("<span class='infoplain'>" + str + "</span>")
|
||||
#define span_interface(str) ("<span class='interface'>" + str + "</span>")
|
||||
#define span_linkify(str) ("<span class='linkify'>" + str + "</span>")
|
||||
#define span_looc(str) ("<span class='looc'>" + str + "</span>")
|
||||
#define span_major_announcement_text(str) ("<span class='major_announcement_text'>" + str + "</span>")
|
||||
#define span_major_announcement_title(str) ("<span class='major_announcement_title'>" + str + "</span>")
|
||||
#define span_medal(str) ("<span class='medal'>" + str + "</span>")
|
||||
#define span_medradio(str) ("<span class='medradio'>" + str + "</span>")
|
||||
#define span_memo(str) ("<span class='memo'>" + str + "</span>")
|
||||
#define span_memoedit(str) ("<span class='memoedit'>" + str + "</span>")
|
||||
#define span_message(str) ("<span class='message'>" + str + "</span>")
|
||||
#define span_mind_control(str) ("<span class='mind_control'>" + str + "</span>")
|
||||
#define span_minorannounce(str) ("<span class='minorannounce'>" + str + "</span>")
|
||||
#define span_minoralert(str) ("<span class='minoralert'>" + str + "</span>")
|
||||
#define span_monkey(str) ("<span class='monkey'>" + str + "</span>")
|
||||
#define span_name(str) ("<span class='name'>" + str + "</span>")
|
||||
#define span_narsie(str) ("<span class='narsie'>" + str + "</span>")
|
||||
#define span_narsiesmall(str) ("<span class='narsiesmall'>" + str + "</span>")
|
||||
#define span_nicegreen(str) ("<span class='nicegreen'>" + str + "</span>")
|
||||
#define span_notice(str) ("<span class='notice'>" + str + "</span>")
|
||||
#define span_noticealien(str) ("<span class='noticealien'>" + str + "</span>")
|
||||
#define span_ooc(str) ("<span class='ooc'>" + str + "</span>")
|
||||
#define span_ooc_announcement_text(str) ("<span class='ooc_announcement_text'>" + str + "</span>")
|
||||
#define span_papyrus(str) ("<span class='papyrus'>" + str + "</span>")
|
||||
#define span_phobia(str) ("<span class='phobia'>" + str + "</span>")
|
||||
#define span_prefix(str) ("<span class='prefix'>" + str + "</span>")
|
||||
#define span_priorityalert(str) ("<span class='priorityalert'>" + str + "</span>")
|
||||
#define span_priorityannounce(str) ("<span class='priorityannounce'>" + str + "</span>")
|
||||
#define span_prioritytitle(str) ("<span class='prioritytitle'>" + str + "</span>")
|
||||
#define span_purple(str) ("<span class='purple'>" + str + "</span>")
|
||||
#define span_radio(str) ("<span class='radio'>" + str + "</span>")
|
||||
#define span_reallybig(str) ("<span class='reallybig'>" + str + "</span>")
|
||||
#define span_red(str) ("<span class='red'>" + str + "</span>")
|
||||
#define span_redteamradio(str) ("<span class='redteamradio'>" + str + "</span>")
|
||||
#define span_redtext(str) ("<span class='redtext'>" + str + "</span>")
|
||||
#define span_resonate(str) ("<span class='resonate'>" + str + "</span>")
|
||||
#define span_revenbignotice(str) ("<span class='revenbignotice'>" + str + "</span>")
|
||||
#define span_revenboldnotice(str) ("<span class='revenboldnotice'>" + str + "</span>")
|
||||
#define span_revendanger(str) ("<span class='revendanger'>" + str + "</span>")
|
||||
#define span_revenminor(str) ("<span class='revenminor'>" + str + "</span>")
|
||||
#define span_revennotice(str) ("<span class='revennotice'>" + str + "</span>")
|
||||
#define span_revenwarning(str) ("<span class='revenwarning'>" + str + "</span>")
|
||||
#define span_robot(str) ("<span class='robot'>" + str + "</span>")
|
||||
#define span_rose(str) ("<span class='rose'>" + str + "</span>")
|
||||
#define span_sans(str) ("<span class='sans'>" + str + "</span>")
|
||||
#define span_sciradio(str) ("<span class='sciradio'>" + str + "</span>")
|
||||
#define span_secradio(str) ("<span class='secradio'>" + str + "</span>")
|
||||
#define span_servradio(str) ("<span class='servradio'>" + str + "</span>")
|
||||
#define span_singing(str) ("<span class='singing'>" + str + "</span>")
|
||||
#define span_slime(str) ("<span class='slime'>" + str + "</span>")
|
||||
#define span_small(str) ("<span class='small'>" + str + "</span>")
|
||||
#define span_smallnotice(str) ("<span class='smallnotice'>" + str + "</span>")
|
||||
#define span_smallnoticeital(str) ("<span class='smallnoticeital'>" + str + "</span>")
|
||||
#define span_spiderbroodmother(str) ("<span class='spiderbroodmother'>" + str + "</span>")
|
||||
#define span_spiderscout(str) ("<span class='spiderscout'>" + str + "</span>")
|
||||
#define span_spiderbreacher(str) ("<span class='spiderbreacher'>" + str + "</span>")
|
||||
#define span_subheader_announcement_text(str) ("<span class='subheader_announcement_text'>" + str + "</span>")
|
||||
#define span_suicide(str) ("<span class='suicide'>" + str + "</span>")
|
||||
#define span_suppradio(str) ("<span class='suppradio'>" + str + "</span>")
|
||||
#define span_syndradio(str) ("<span class='syndradio'>" + str + "</span>")
|
||||
#define span_tape_recorder(str) ("<span class='tape_recorder'>" + str + "</span>")
|
||||
#define span_tinynotice(str) ("<span class='tinynotice'>" + str + "</span>")
|
||||
#define span_tinynoticeital(str) ("<span class='tinynoticeital'>" + str + "</span>")
|
||||
#define span_unconscious(str) ("<span class='unconscious'>" + str + "</span>")
|
||||
#define span_userdanger(str) ("<span class='userdanger'>" + str + "</span>")
|
||||
#define span_warning(str) ("<span class='warning'>" + str + "</span>")
|
||||
#define span_yell(str) ("<span class='yell'>" + str + "</span>")
|
||||
#define span_yellowteamradio(str) ("<span class='yellowteamradio'>" + str + "</span>")
|
||||
|
||||
// Spans that use embedded tgui components:
|
||||
// Sorted alphabetically
|
||||
#define span_tooltip(tip, main_text) ("<span data-component=\"Tooltip\" data-content=\"" + tip + "\" class=\"tooltip\">" + main_text + "</span>")
|
||||
@@ -230,6 +230,7 @@
|
||||
#define TRAIT_NO_BUCKLE "no_buckle"
|
||||
#define TRAIT_DOCILE "docile"
|
||||
#define TRAIT_LIVESTOCK "livestock"
|
||||
#define TRAIT_NO_FAT_SLOWDOWN "no_fat_slowdown"
|
||||
|
||||
// common trait sources
|
||||
#define TRAIT_GENERIC "generic"
|
||||
|
||||
@@ -744,8 +744,7 @@
|
||||
gloves = /obj/item/clothing/gloves/combat
|
||||
ears = /obj/item/radio/headset/syndicate/alt
|
||||
back = /obj/item/storage/backpack
|
||||
r_hand = /obj/item/storage/box/syndie_kit/soporific_bundle
|
||||
l_hand = /obj/item/gun/ballistic/automatic/pistol
|
||||
l_hand = /obj/item/gun/energy/kinetic_accelerator/crossbow/feeder
|
||||
l_pocket = /obj/item/crowbar
|
||||
r_pocket = /obj/item/gun/energy/fatoray
|
||||
id = /obj/item/card/id/syndicate/anyone
|
||||
|
||||
@@ -128,14 +128,41 @@
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
|
||||
requires_power = TRUE
|
||||
|
||||
/area/awaymission/snowdin/comms
|
||||
name = "Radio Tower"
|
||||
icon_state = "awaycontent16"
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
requires_power = TRUE
|
||||
|
||||
/area/awaymission/snowdin/cabin
|
||||
name = "Strange cabin"
|
||||
icon_state = "awaycontent18"
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
requires_power = FALSE
|
||||
|
||||
/area/awaymission/snowdin/cargo
|
||||
name = "Exploration Base"
|
||||
icon_state = "awaycontent16"
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
|
||||
requires_power = TRUE
|
||||
|
||||
/area/awaymission/snowdin/transit
|
||||
name = "Transit Shuttle Docks"
|
||||
icon_state = "awaycontent16"
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
|
||||
requires_power = FALSE
|
||||
|
||||
/area/shuttle/snowdin/elevator1
|
||||
name = "Excavation Elevator"
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/shuttle/snowdin/elevator2
|
||||
name = "Mining Elevator"
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
/area/shuttle/snowdin/transit
|
||||
name = "Snowdin Outpost - Transit Shuttle"
|
||||
dynamic_lighting = DYNAMIC_LIGHTING_FORCED
|
||||
|
||||
//shuttle console for elevators//
|
||||
|
||||
@@ -155,7 +182,7 @@
|
||||
icon_keyboard = "tech_key"
|
||||
light_color = LIGHT_COLOR_CYAN
|
||||
shuttleId = "snowdintransit"
|
||||
possible_destinations = "snowdintransit_a;snowdintransit_b"
|
||||
possible_destinations = "snowdintransit_a;snowdintransit_b;snowdintransit_c"
|
||||
|
||||
//liquid plasma!!!!!!//
|
||||
|
||||
@@ -514,10 +541,8 @@
|
||||
name = "dungeon heavy"
|
||||
loot = list(/obj/item/twohanded/singularityhammer = 1,
|
||||
/obj/item/twohanded/dualsaber/hypereutactic = 1,
|
||||
/obj/item/organ/brain/alien = 1,
|
||||
/obj/item/gun/ballistic/automatic/c20r/unrestricted = 1,
|
||||
/obj/item/book/granter/spell/charge = 1,
|
||||
/obj/item/book/granter/martial/cqc = 1,
|
||||
/obj/item/book/granter/spell/fattening/steal = 1,
|
||||
/obj/item/dnainjector/lasereyesmut = 1,
|
||||
/obj/item/book/granter/spell/fattening/transfer = 1)
|
||||
@@ -527,11 +552,12 @@
|
||||
lootdoubles = 2
|
||||
lootcount = 1
|
||||
|
||||
loot = list(/obj/item/stack/sheet/mineral/snow{amount = 25} = 10,
|
||||
/obj/item/toy/snowball = 15,
|
||||
/obj/item/shovel = 10,
|
||||
loot = list(/obj/item/stack/sheet/mineral/snow{amount = 25} = 1,
|
||||
/obj/item/toy/snowball = 5,
|
||||
/obj/item/shovel = 4,
|
||||
/obj/item/twohanded/spear = 8,
|
||||
)
|
||||
/obj/item/stack/ore/iron{amount = 50} = 10,
|
||||
/obj/item/stack/ore/glass{amount = 50} = 10)
|
||||
|
||||
//special items//--
|
||||
|
||||
|
||||
@@ -1893,7 +1893,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
|
||||
|
||||
// Hyperstation 13: Mood now influences action speed.
|
||||
|
||||
if(H.fatness) // GS13
|
||||
if(H.fatness && !HAS_TRAIT(H, TRAIT_NO_FAT_SLOWDOWN)) // GS13
|
||||
var/fatness_delay = (H.fatness / FATNESS_DIVISOR)
|
||||
if(H.fatness < FATNESS_LEVEL_BARELYMOBILE)
|
||||
fatness_delay = fatness_delay - flight
|
||||
|
||||
@@ -67,7 +67,6 @@
|
||||
Every day, you pause and recollect your memories from before it all happened... "
|
||||
assignedrole = "Arctic Exile"
|
||||
mirrorcanloadappearance = TRUE
|
||||
ghost_usable = FALSE
|
||||
|
||||
/obj/effect/mob_spawn/human/exiled/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -81,7 +80,6 @@
|
||||
outfit.suit = /obj/item/clothing/suit/hooded/wintercoat
|
||||
outfit.shoes = /obj/item/clothing/shoes/winterboots
|
||||
outfit.back = /obj/item/storage/backpack
|
||||
outfit.id = /obj/item/card/id/away/snowdin/eng
|
||||
outfit.implants = list(/obj/item/implant/exile) //Made it so they cannot simply exit through the gateway at will.
|
||||
|
||||
/obj/effect/mob_spawn/human/exiled/Destroy()
|
||||
|
||||
@@ -98,6 +98,7 @@
|
||||
#include "code\__DEFINES\sight.dm"
|
||||
#include "code\__DEFINES\sound.dm"
|
||||
#include "code\__DEFINES\spaceman_dmm.dm"
|
||||
#include "code\__DEFINES\span.dm"
|
||||
#include "code\__DEFINES\stat.dm"
|
||||
#include "code\__DEFINES\stat_tracking.dm"
|
||||
#include "code\__DEFINES\status_effects.dm"
|
||||
@@ -3161,6 +3162,8 @@
|
||||
#include "GainStation13\code\obj\weapons\alter_rays.dm"
|
||||
#include "GainStation13\code\obj\weapons\fatbeam.dm"
|
||||
#include "GainStation13\code\obj\weapons\fatoray.dm"
|
||||
#include "GainStation13\code\obj\weapons\feeder_ebow.dm"
|
||||
#include "GainStation13\code\structures\trapped_items.dm"
|
||||
#include "GainStation13\icons\obj\vairous_weapons.dm"
|
||||
#include "hyperstation\code\__DEFINES\economy.dm"
|
||||
#include "hyperstation\code\__DEFINES\wendigo.dm"
|
||||
|
||||
Reference in New Issue
Block a user