cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-10 23:47:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'evilew:master' into master

Browse Source
This commit is contained in:
Alphas00
2024-09-05 17:59:09 +02:00
committed by GitHub
parent 7da65d8589 f5abc69b16
commit 679953b2af
18 changed files with 3260 additions and 2181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/access.dm
+3 -2
View File
@@ -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
code/__DEFINES/span.dm
+141
View File
@@ -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>")
code/__DEFINES/traits.dm
+1
View File
@@ -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"
code/modules/awaymissions/corpse.dm
+1 -2
View File
@@ -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
code/modules/awaymissions/mission_code/snowdin.dm
+33 -7
View File
@@ -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//--
code/modules/mob/living/carbon/human/species.dm
+1 -1
View File
@@ -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