Merge pull request #21 from ReoDaProtovali/Fixing-the-fixes
Plentitide of small fixes part 2: electric boogaloo
This commit is contained in:
evilew
@@ -454,14 +454,14 @@ GLOBAL_LIST_INIT(pda_reskins, list(
|
||||
#define STACK_CHECK_ADJACENT "adjacent" //checks if there is an object of the result type within one tile
|
||||
|
||||
//text files
|
||||
#define BRAIN_DAMAGE_FILE "traumas.json"
|
||||
#define ION_FILE "ion_laws.json"
|
||||
#define BRAIN_DAMAGE_FILE "traumas_gs.json" //GS13 Edit: Less meta memes
|
||||
#define ION_FILE "ion_laws_gs.json" //GS13 Edit: we're changing some of the things here, and removing other things
|
||||
#define PIRATE_NAMES_FILE "pirates.json"
|
||||
#define REDPILL_FILE "redpill.json"
|
||||
#define ARCADE_FILE "arcade.json"
|
||||
// #define BOOMER_FILE "boomer.json"
|
||||
// #define LOCATIONS_FILE "locations.json"
|
||||
// #define WANTED_FILE "wanted_message.json"
|
||||
// #define WANTED_FILE "wanted_message_gs.json" //GS13 Edit: ...This is commented out, but I'll swap it to ours, incase it needs to be renabled.
|
||||
// #define VISTA_FILE "steve.json"
|
||||
#define FLESH_SCAR_FILE "wounds/flesh_scar_desc.json"
|
||||
#define BONE_SCAR_FILE "wounds/bone_scar_desc.json"
|
||||
@@ -569,7 +569,7 @@ GLOBAL_LIST_INIT(pda_reskins, list(
|
||||
#define SHOES_TIED 1
|
||||
#define SHOES_KNOTTED 2
|
||||
|
||||
#define WANTED_FILE "wanted_message.json"
|
||||
#define WANTED_FILE "wanted_message_gs.json" //GS Edit: Nanotrasen to Gato.
|
||||
|
||||
// Notification action types
|
||||
#define NOTIFY_JUMP "jump"
|
||||
|
||||
@@ -290,11 +290,11 @@ GLOBAL_LIST_INIT(TAGGERLOCATIONS, list("Disposals",
|
||||
"Circuitry", "Toxins", "Dormitories", "Virology",
|
||||
"Xenobiology", "Law Office","Detective's Office"))
|
||||
|
||||
GLOBAL_LIST_INIT(station_prefixes, world.file2list("strings/station_prefixes.txt") + "")
|
||||
GLOBAL_LIST_INIT(station_prefixes, world.file2list("GainStation13/strings/station_prefixes.txt") + "") //GS13 Edit: Our Names
|
||||
|
||||
GLOBAL_LIST_INIT(station_names, world.file2list("strings/station_names.txt" + ""))
|
||||
GLOBAL_LIST_INIT(station_names, world.file2list("GainStation13/strings/station_names.txt" + "")) //GS13 Edit: Our names
|
||||
|
||||
GLOBAL_LIST_INIT(station_suffixes, world.file2list("strings/station_suffixes.txt"))
|
||||
GLOBAL_LIST_INIT(station_suffixes, world.file2list("GainStation13/strings/station_suffixes.txt")) //GS13 Edit: Our names
|
||||
|
||||
GLOBAL_LIST_INIT(server_taglines, world.file2list("[global.config.directory]/server_taglines.txt"))
|
||||
|
||||
@@ -361,4 +361,4 @@ GLOBAL_LIST_INIT(bodypart_names, list(num2text(HEAD) = "Head", num2text(CHEST) =
|
||||
// list linking bodypart names back to the bitflags
|
||||
GLOBAL_LIST_INIT(bodypart_values, list("Head" = num2text(HEAD), "Chest" = num2text(CHEST), "Left Leg" = num2text(LEG_LEFT), "Right Leg" = num2text(LEG_RIGHT), "Left Arm" = num2text(ARM_LEFT), "Right Arm" = num2text(ARM_RIGHT)))
|
||||
|
||||
GLOBAL_LIST_INIT(junkmail_messages, world.file2list("strings/junkmail.txt"))
|
||||
GLOBAL_LIST_INIT(junkmail_messages, world.file2list("GainStation13/strings/junkmail.txt")) //GS Edit: Nanotrasen to GATO
|
||||
|
||||
@@ -29,7 +29,7 @@ GLOBAL_LIST_INIT(verbs, world.file2list("strings/names/verbs.txt"))
|
||||
GLOBAL_LIST_INIT(ing_verbs, world.file2list("strings/names/ing_verbs.txt"))
|
||||
GLOBAL_LIST_INIT(adverbs, world.file2list("strings/names/adverbs.txt"))
|
||||
GLOBAL_LIST_INIT(adjectives, world.file2list("strings/names/adjectives.txt"))
|
||||
GLOBAL_LIST_INIT(dream_strings, world.file2list("strings/dreamstrings.txt"))
|
||||
GLOBAL_LIST_INIT(dream_strings, world.file2list("GainStation13/strings/dreamstrings.txt")) //GS13 Edit: Nanotrasen to Gato... And our own additions
|
||||
//loaded on startup because of "
|
||||
//would include in rsc if ' was used
|
||||
|
||||
|
||||
@@ -163,12 +163,14 @@
|
||||
if(_codeword)
|
||||
codeword = _codeword
|
||||
else
|
||||
codeword = pick(strings("ion_laws.json", "ionabstract")\
|
||||
| strings("ion_laws.json", "ionobjects")\
|
||||
| strings("ion_laws.json", "ionadjectives")\
|
||||
| strings("ion_laws.json", "ionthreats")\
|
||||
| strings("ion_laws.json", "ionfood")\
|
||||
| strings("ion_laws.json", "iondrinks"))
|
||||
//GS13 Start: We're using our file
|
||||
codeword = pick(strings("ion_laws_gs.json", "ionabstract")\
|
||||
| strings("ion_laws_gs.json", "ionobjects")\
|
||||
| strings("ion_laws_gs.json", "ionadjectives")\
|
||||
| strings("ion_laws_gs.json", "ionthreats")\
|
||||
| strings("ion_laws_gs.json", "ionfood")\
|
||||
| strings("ion_laws_gs.json", "iondrinks"))
|
||||
//GS13 End
|
||||
|
||||
/datum/brain_trauma/severe/split_personality/brainwashing/on_gain()
|
||||
..()
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
|
||||
/obj/machinery/door/airlock
|
||||
name = "airlock"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/public.dmi' //GS13 change (perspective sprites)
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/public.dmi' //GS13 Edit: perspective sprites
|
||||
icon_state = "closed"
|
||||
max_integrity = 300
|
||||
var/normal_integrity = AIRLOCK_INTEGRITY_N
|
||||
@@ -87,8 +87,10 @@
|
||||
var/previous_airlock = /obj/structure/door_assembly //what airlock assembly mineral plating was applied to
|
||||
var/wiretypepath = /datum/wires/airlock // which set of per round randomized wires this airlock type has.
|
||||
var/airlock_material //material of inner filling; if its an airlock with glass, this should be set to "glass"
|
||||
//GS13 Edit Start: perspective sprites
|
||||
var/overlays_file = 'GainStation13/icons/obj/doors/airlocks/station/overlays.dmi'
|
||||
var/note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/station/overlays.dmi' //Used for papers and photos pinned to the airlock
|
||||
//GS13 End
|
||||
|
||||
var/cyclelinkeddir = 0
|
||||
var/obj/machinery/door/airlock/cyclelinkedairlock
|
||||
@@ -611,22 +613,22 @@
|
||||
/obj/machinery/door/airlock/proc/check_unres() //unrestricted sides. This overlay indicates which directions the player can access even without an ID
|
||||
if(hasPower() && unres_sides)
|
||||
if(unres_sides & NORTH)
|
||||
var/image/I = image(icon='GainStation13/icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_n") //layer=src.layer+1
|
||||
var/image/I = image(icon='GainStation13/icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_n") //layer=src.layer+1 //GS13 Edit: perspective sprites
|
||||
I.pixel_y = 32
|
||||
set_light(l_range = 2, l_power = 1)
|
||||
add_overlay(I)
|
||||
if(unres_sides & SOUTH)
|
||||
var/image/I = image(icon='GainStation13/icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_s") //layer=src.layer+1
|
||||
var/image/I = image(icon='GainStation13/icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_s") //layer=src.layer+1 //GS13 Edit: perspective sprites
|
||||
I.pixel_y = -32
|
||||
set_light(l_range = 2, l_power = 1)
|
||||
add_overlay(I)
|
||||
if(unres_sides & EAST)
|
||||
var/image/I = image(icon='GainStation13/icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_e") //layer=src.layer+1
|
||||
var/image/I = image(icon='GainStation13/icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_e") //layer=src.layer+1 //GS13 Edit: perspective sprites
|
||||
I.pixel_x = 32
|
||||
set_light(l_range = 2, l_power = 1)
|
||||
add_overlay(I)
|
||||
if(unres_sides & WEST)
|
||||
var/image/I = image(icon='GainStation13/icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_w") //layer=src.layer+1
|
||||
var/image/I = image(icon='GainStation13/icons/obj/doors/airlocks/station/overlays.dmi', icon_state="unres_w") //layer=src.layer+1 //GS13 Edit: perspective sprites
|
||||
I.pixel_x = -32
|
||||
set_light(l_range = 2, l_power = 1)
|
||||
add_overlay(I)
|
||||
|
||||
@@ -2,25 +2,23 @@
|
||||
Station Airlocks Regular
|
||||
*/
|
||||
|
||||
//GS13 - changed most of these airlock sprite paths to use perspective-oriented airlocks
|
||||
|
||||
/obj/machinery/door/airlock/abandoned
|
||||
abandoned = TRUE
|
||||
|
||||
/obj/machinery/door/airlock/command
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/command.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/command.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_com
|
||||
wiretypepath = /datum/wires/airlock/command
|
||||
normal_integrity = 450
|
||||
|
||||
/obj/machinery/door/airlock/security
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/security.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/security.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_sec
|
||||
wiretypepath = /datum/wires/airlock/security
|
||||
normal_integrity = 450
|
||||
|
||||
/obj/machinery/door/airlock/engineering
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/engineering.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/engineering.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_eng
|
||||
wiretypepath = /datum/wires/airlock/engineering
|
||||
|
||||
@@ -28,13 +26,13 @@
|
||||
abandoned = TRUE
|
||||
|
||||
/obj/machinery/door/airlock/medical
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/medical.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/medical.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_med
|
||||
wiretypepath = /datum/wires/airlock/medical
|
||||
|
||||
/obj/machinery/door/airlock/maintenance
|
||||
name = "maintenance access"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/maintenance.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/maintenance.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_mai
|
||||
normal_integrity = 250
|
||||
|
||||
@@ -43,18 +41,18 @@
|
||||
|
||||
/obj/machinery/door/airlock/maintenance/external
|
||||
name = "external airlock access"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/maintenanceexternal.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/maintenanceexternal.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_extmai
|
||||
|
||||
/obj/machinery/door/airlock/mining
|
||||
name = "mining airlock"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/mining.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/mining.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_min
|
||||
wiretypepath = /datum/wires/airlock/cargo
|
||||
|
||||
/obj/machinery/door/airlock/atmos
|
||||
name = "atmospherics airlock"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/atmos.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/atmos.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_atmo
|
||||
wiretypepath = /datum/wires/airlock/engineering
|
||||
|
||||
@@ -62,22 +60,22 @@
|
||||
abandoned = TRUE
|
||||
|
||||
/obj/machinery/door/airlock/research
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/research.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/research.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_research
|
||||
wiretypepath = /datum/wires/airlock/science
|
||||
|
||||
/obj/machinery/door/airlock/freezer
|
||||
name = "freezer airlock"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/freezer.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/freezer.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_fre
|
||||
|
||||
/obj/machinery/door/airlock/science
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/science.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/science.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_science
|
||||
wiretypepath = /datum/wires/airlock/science
|
||||
|
||||
/obj/machinery/door/airlock/virology
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/virology.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/virology.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_viro
|
||||
wiretypepath = /datum/wires/airlock/medical
|
||||
|
||||
@@ -181,7 +179,7 @@
|
||||
|
||||
/obj/machinery/door/airlock/gold
|
||||
name = "gold airlock"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/gold.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/gold.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_gold
|
||||
|
||||
/obj/machinery/door/airlock/gold/glass
|
||||
@@ -190,7 +188,7 @@
|
||||
|
||||
/obj/machinery/door/airlock/silver
|
||||
name = "silver airlock"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/silver.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/silver.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_silver
|
||||
|
||||
/obj/machinery/door/airlock/silver/glass
|
||||
@@ -199,7 +197,7 @@
|
||||
|
||||
/obj/machinery/door/airlock/diamond
|
||||
name = "diamond airlock"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/diamond.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/diamond.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_diamond
|
||||
normal_integrity = 1000
|
||||
explosion_block = 2
|
||||
@@ -211,7 +209,7 @@
|
||||
|
||||
/obj/machinery/door/airlock/uranium
|
||||
name = "uranium airlock"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/uranium.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/uranium.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_uranium
|
||||
var/last_event = 0
|
||||
|
||||
@@ -233,7 +231,7 @@
|
||||
/obj/machinery/door/airlock/plasma
|
||||
name = "plasma airlock"
|
||||
desc = "No way this can end badly."
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/plasma.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/plasma.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_plasma
|
||||
|
||||
/obj/machinery/door/airlock/plasma/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
|
||||
@@ -274,7 +272,7 @@
|
||||
/obj/machinery/door/airlock/bananium
|
||||
name = "bananium airlock"
|
||||
desc = "Honkhonkhonk"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/bananium.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/bananium.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_bananium
|
||||
doorOpen = 'sound/items/bikehorn.ogg'
|
||||
|
||||
@@ -284,7 +282,7 @@
|
||||
|
||||
/obj/machinery/door/airlock/sandstone
|
||||
name = "sandstone airlock"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/sandstone.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/sandstone.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_sandstone
|
||||
|
||||
/obj/machinery/door/airlock/sandstone/glass
|
||||
@@ -293,7 +291,7 @@
|
||||
|
||||
/obj/machinery/door/airlock/wood
|
||||
name = "wooden airlock"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/wood.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/wood.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_wood
|
||||
|
||||
/obj/machinery/door/airlock/wood/glass
|
||||
@@ -303,8 +301,8 @@
|
||||
/obj/machinery/door/airlock/titanium
|
||||
name = "shuttle airlock"
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_titanium
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/shuttle/shuttle.dmi'
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/shuttle/overlays.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/shuttle/shuttle.dmi' //GS13 Edit: perspective sprites
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/shuttle/overlays.dmi' //GS13 Edit: perspective sprites
|
||||
normal_integrity = 400
|
||||
|
||||
/obj/machinery/door/airlock/titanium/glass
|
||||
@@ -314,8 +312,8 @@
|
||||
|
||||
/obj/machinery/door/airlock/bronze
|
||||
name = "bronze airlock"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi'
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/clockwork/overlays.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/clockwork/pinion_airlock.dmi' //GS13 Edit: perspective sprites
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/clockwork/overlays.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_bronze
|
||||
|
||||
/obj/machinery/door/airlock/bronze/seethru
|
||||
@@ -329,8 +327,8 @@
|
||||
*/
|
||||
|
||||
/obj/machinery/door/airlock/public
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station2/glass.dmi'
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/station2/overlays.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station2/glass.dmi' //GS13 Edit: perspective sprites
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/station2/overlays.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_public
|
||||
|
||||
/obj/machinery/door/airlock/public/glass
|
||||
@@ -358,9 +356,9 @@
|
||||
|
||||
/obj/machinery/door/airlock/external
|
||||
name = "external airlock"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/external/external.dmi'
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/external/overlays.dmi'
|
||||
note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/external/overlays.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/external/external.dmi' //GS13 Edit: perspective sprites
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/external/overlays.dmi' //GS13 Edit: perspective sprites
|
||||
note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/external/overlays.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_ext
|
||||
|
||||
/obj/machinery/door/airlock/external/glass
|
||||
@@ -373,16 +371,16 @@
|
||||
*/
|
||||
|
||||
/obj/machinery/door/airlock/centcom //Use grunge as a station side version, as these have special effects related to them via phobias and such.
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/centcom/centcom.dmi'
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/centcom/overlays.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/centcom/centcom.dmi' //GS13 Edit: perspective sprites
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/centcom/overlays.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_centcom
|
||||
normal_integrity = 1000
|
||||
security_level = 6
|
||||
explosion_block = 2
|
||||
|
||||
/obj/machinery/door/airlock/grunge
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/centcom/centcom.dmi'
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/centcom/overlays.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/centcom/centcom.dmi' //GS13 Edit: perspective sprites
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/centcom/overlays.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_grunge
|
||||
|
||||
/obj/machinery/door/airlock/grunge/abandoned
|
||||
@@ -395,8 +393,8 @@
|
||||
|
||||
/obj/machinery/door/airlock/vault
|
||||
name = "vault door"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/vault/vault.dmi'
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/vault/overlays.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/vault/vault.dmi' //GS13 Edit: perspective sprites
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/vault/overlays.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_vault
|
||||
wiretypepath = /datum/wires/airlock/secure
|
||||
explosion_block = 2
|
||||
@@ -410,16 +408,16 @@
|
||||
|
||||
/obj/machinery/door/airlock/hatch
|
||||
name = "airtight hatch"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/hatch/centcom.dmi'
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi'
|
||||
note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/hatch/centcom.dmi' //GS13 Edit: perspective sprites
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi' //GS13 Edit: perspective sprites
|
||||
note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_hatch
|
||||
|
||||
/obj/machinery/door/airlock/maintenance_hatch
|
||||
name = "maintenance hatch"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/hatch/maintenance.dmi'
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi'
|
||||
note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/hatch/maintenance.dmi' //GS13 Edit: perspective sprites
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi' //GS13 Edit: perspective sprites
|
||||
note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/hatch/overlays.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_mhatch
|
||||
|
||||
/obj/machinery/door/airlock/maintenance_hatch/abandoned
|
||||
@@ -432,8 +430,8 @@
|
||||
|
||||
/obj/machinery/door/airlock/highsecurity
|
||||
name = "high tech security airlock"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/highsec/highsec.dmi'
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/highsec/overlays.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/highsec/highsec.dmi' //GS13 Edit: perspective sprites
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/highsec/overlays.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_highsecurity
|
||||
explosion_block = 2
|
||||
normal_integrity = 500
|
||||
@@ -447,8 +445,8 @@
|
||||
|
||||
/obj/machinery/door/airlock/shuttle
|
||||
name = "shuttle airlock"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/shuttle/shuttle.dmi'
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/shuttle/overlays.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/shuttle/shuttle.dmi' //GS13 Edit: perspective sprites
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/shuttle/overlays.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_shuttle
|
||||
|
||||
/obj/machinery/door/airlock/shuttle/glass
|
||||
@@ -458,10 +456,10 @@
|
||||
/obj/machinery/door/airlock/abductor
|
||||
name = "alien airlock"
|
||||
desc = "With humanity's current technological level, it could take years to hack this advanced airlock... or maybe we should give a screwdriver a try?"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/abductor/abductor_airlock.dmi'
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/abductor/overlays.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/abductor/abductor_airlock.dmi' //GS13 Edit: perspective sprites
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/abductor/overlays.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_abductor
|
||||
note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/external/overlays.dmi'
|
||||
note_overlay_file = 'GainStation13/icons/obj/doors/airlocks/external/overlays.dmi' //GS13 Edit: perspective sprites
|
||||
damage_deflection = 30
|
||||
explosion_block = 3
|
||||
hackProof = TRUE
|
||||
@@ -476,8 +474,8 @@
|
||||
|
||||
/obj/machinery/door/airlock/cult
|
||||
name = "cult airlock"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/cult/runed/cult.dmi'
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/cult/runed/overlays.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/cult/runed/cult.dmi' //GS13 Edit: perspective sprites
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/cult/runed/overlays.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_cult
|
||||
hackProof = TRUE
|
||||
aiControlDisabled = 1
|
||||
@@ -526,8 +524,8 @@
|
||||
return FALSE
|
||||
|
||||
/obj/machinery/door/airlock/cult/proc/conceal()
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/maintenance.dmi'
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/station/overlays.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/station/maintenance.dmi' //GS13 Edit: perspective sprites
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/station/overlays.dmi' //GS13 Edit: perspective sprites
|
||||
name = "airlock"
|
||||
desc = "It opens and closes."
|
||||
stealthy = TRUE
|
||||
@@ -558,8 +556,8 @@
|
||||
friendly = TRUE
|
||||
|
||||
/obj/machinery/door/airlock/cult/unruned
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/cult/unruned/cult.dmi'
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/cult/unruned/overlays.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/cult/unruned/cult.dmi' //GS13 Edit: perspective sprites
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/cult/unruned/overlays.dmi' //GS13 Edit: perspective sprites
|
||||
assemblytype = /obj/structure/door_assembly/door_assembly_cult/unruned
|
||||
openingoverlaytype = /obj/effect/temp_visual/cult/door/unruned
|
||||
|
||||
@@ -701,8 +699,8 @@
|
||||
|
||||
/obj/machinery/door/airlock/glass_large
|
||||
name = "large glass airlock"
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/glass_large/glass_large.dmi'
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/glass_large/overlays.dmi'
|
||||
icon = 'GainStation13/icons/obj/doors/airlocks/glass_large/glass_large.dmi' //GS13 Edit: perspective sprites
|
||||
overlays_file = 'GainStation13/icons/obj/doors/airlocks/glass_large/overlays.dmi' //GS13 Edit: perspective sprites
|
||||
opacity = 0
|
||||
assemblytype = null
|
||||
glass = TRUE
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/obj/machinery/door/poddoor
|
||||
name = "blast door"
|
||||
desc = "A heavy duty blast door that opens mechanically."
|
||||
icon = 'GainStation13/icons/obj/doors/blastdoor.dmi' //GS13
|
||||
icon = 'GainStation13/icons/obj/doors/blastdoor.dmi' //GS13 Edit: perspective sprites
|
||||
icon_state = "closed"
|
||||
var/id = 1
|
||||
layer = BLASTDOOR_LAYER
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
gender = PLURAL
|
||||
name = "shutters"
|
||||
desc = "Mechanical metal shutters operated by a button with a magnetic seal, keeping them airtight."
|
||||
icon = 'GainStation13/icons/obj/doors/shutters.dmi' //GS13
|
||||
icon = 'icons/obj/doors/shutters.dmi'
|
||||
layer = SHUTTER_LAYER
|
||||
closingLayer = SHUTTER_LAYER
|
||||
armor = list(MELEE = 20, BULLET = 20, LASER = 20, ENERGY = 75, BOMB = 25, BIO = 100, RAD = 100, FIRE = 100, ACID = 70)
|
||||
@@ -22,7 +22,7 @@
|
||||
/obj/machinery/door/poddoor/shutters/old
|
||||
name = "strong shutters"
|
||||
desc = "These shutters have an armoured frame; it looks like plasteel. These shutters look robust enough to survive explosions."
|
||||
icon = 'GainStation13/icons/obj/doors/shutters_old.dmi' //GS13
|
||||
icon = 'icons/obj/doors/shutters_old.dmi'
|
||||
icon_state = "closed"
|
||||
armor = list(MELEE = 30, BULLET = 30, LASER = 30, ENERGY = 75, BOMB = 30, BIO = 100, RAD = 100, FIRE = 100, ACID = 70)
|
||||
max_integrity = 300
|
||||
@@ -37,7 +37,7 @@
|
||||
/obj/machinery/door/poddoor/shutters/radiation
|
||||
name = "radiation shutters"
|
||||
desc = "Lead-lined shutters painted yellow with a radioactive hazard symbol on it. Blocks out most radiation"
|
||||
icon = 'GainStation13/icons/obj/doors/shutters_radiation.dmi' //GS13
|
||||
icon = 'icons/obj/doors/shutters_radiation.dmi'
|
||||
icon_state = "closed"
|
||||
rad_insulation = 0.2
|
||||
|
||||
@@ -60,7 +60,7 @@
|
||||
/obj/machinery/door/poddoor/shutters/window
|
||||
name = "windowed shutters"
|
||||
desc = "Mechanical shutters that have some form of plastic window in them, allowing you to see through the shutters at all times."
|
||||
icon = 'GainStation13/icons/obj/doors/shutters_window.dmi' //GS13
|
||||
icon = 'icons/obj/doors/shutters_window.dmi'
|
||||
icon_state = "closed"
|
||||
opacity = 0
|
||||
glass = 1
|
||||
|
||||
@@ -277,24 +277,26 @@
|
||||
icon_state = "salt_pile"
|
||||
gender = NEUTER
|
||||
|
||||
/obj/effect/decal/cleanable/glitter //GS13 - changed glitters to more subtle variants
|
||||
/obj/effect/decal/cleanable/glitter
|
||||
name = "generic glitter pile"
|
||||
desc = "The herpes of arts and crafts."
|
||||
icon = 'GainStation13/icons/effects/atmospherics.dmi'
|
||||
icon_state = "glitter"
|
||||
icon = 'icons/effects/atmospherics.dmi'
|
||||
gender = NEUTER
|
||||
mergeable_decal = TRUE
|
||||
persistent = FALSE
|
||||
|
||||
/obj/effect/decal/cleanable/glitter/pink
|
||||
name = "pink glitter"
|
||||
icon_state = "plasma_old"
|
||||
color = "#9e0089"
|
||||
|
||||
/obj/effect/decal/cleanable/glitter/white
|
||||
name = "white glitter"
|
||||
icon_state = "nitrous_oxide_old"
|
||||
|
||||
/obj/effect/decal/cleanable/glitter/blue
|
||||
name = "blue glitter"
|
||||
icon_state = "freon_old"
|
||||
color = "#2dd6ff"
|
||||
|
||||
/obj/effect/decal/cleanable/plasma
|
||||
|
||||
@@ -160,7 +160,7 @@
|
||||
buildstacktype = null //Custom mats handle this
|
||||
|
||||
/obj/structure/chair/wood
|
||||
icon = 'GainStation13/icons/obj/chairs.dmi'
|
||||
icon = 'GainStation13/icons/obj/chairs.dmi' //GS13 Edit: Our sprites
|
||||
icon_state = "wooden_chair"
|
||||
name = "wooden chair"
|
||||
desc = "Old is never too old to not be in fashion."
|
||||
@@ -540,7 +540,7 @@
|
||||
|
||||
/obj/item/chair/wood
|
||||
name = "wooden chair"
|
||||
icon = 'GainStation13/icons/obj/chairs.dmi'
|
||||
icon = 'GainStation13/icons/obj/chairs.dmi' //GS13 Edit: Our sprites
|
||||
icon_state = "wooden_chair_toppled"
|
||||
item_state = "woodenchair"
|
||||
resistance_flags = FLAMMABLE
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
/datum/objective/abductee/random
|
||||
|
||||
/datum/objective/abductee/random/New()
|
||||
explanation_text = pick(world.file2list("strings/abductee_objectives.txt"))
|
||||
explanation_text = pick(world.file2list("GainStation13/strings/abductee_objectives.txt")) //GS13 Edit: Nanotrasen to GATO
|
||||
|
||||
/datum/objective/abductee/steal
|
||||
explanation_text = "Steal all"
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
name = "Anomaly: Pyroclastic"
|
||||
typepath = /datum/round_event/anomaly/anomaly_pyro
|
||||
|
||||
min_players = 10 //GS13 tweak
|
||||
max_occurrences = 0
|
||||
min_players = 10 //GS13 Edit: tweak
|
||||
max_occurrences = 0 //GS13 Edit: Disabling this for now.
|
||||
weight = 20
|
||||
description = "This anomaly sets things on fire, and creates a pyroclastic slime."
|
||||
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
name = "Spontaneous Brain Trauma"
|
||||
typepath = /datum/round_event/brain_trauma
|
||||
weight = 25
|
||||
min_players = 20 //GS13 - somewhat harmless ig
|
||||
max_occurrences = 0
|
||||
min_players = 20 //GS13 Edit: 8 to 20. You cant really fix this on your own if you arnt medical.
|
||||
max_occurrences = 0 //GS13 Edit: Disabling this.
|
||||
category = EVENT_CATEGORY_HEALTH
|
||||
description = "A crewmember gains a random trauma."
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
weight = 5
|
||||
|
||||
min_players = 15
|
||||
max_occurrences = 0
|
||||
max_occurrences = 0 //GS13 Edit: Disabling this for now.
|
||||
category = EVENT_CATEGORY_AI
|
||||
description = "Vending machines will attack people until the Patient Zero is disabled."
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
/datum/round_event_control/disease_outbreak
|
||||
name = "Disease Outbreak"
|
||||
typepath = /datum/round_event/disease_outbreak
|
||||
max_occurrences = 0
|
||||
max_occurrences = 0 //GS13 Edit: Disabling this for now.
|
||||
min_players = 5
|
||||
weight = 5
|
||||
category = EVENT_CATEGORY_HEALTH
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
/datum/round_event_control/electrical_storm
|
||||
name = "Electrical Storm"
|
||||
typepath = /datum/round_event/electrical_storm
|
||||
earliest_start = 30 MINUTES
|
||||
earliest_start = 30 MINUTES //GS13 Edit: Reducing pain for normal station ongoings.
|
||||
min_players = 5
|
||||
weight = 40
|
||||
max_occurrences = 2
|
||||
max_occurrences = 2 //GS13 Edit: Limiting this.
|
||||
category = EVENT_CATEGORY_ENGINEERING
|
||||
description = "Destroys all lights in a large area."
|
||||
|
||||
/datum/round_event/electrical_storm
|
||||
var/lightsoutAmount = 1
|
||||
var/lightsoutRange = 10
|
||||
var/lightsoutRange = 10 //GS13 Edit: 25 down to 10
|
||||
announce_when = 1
|
||||
|
||||
/datum/round_event/electrical_storm/announce(fake)
|
||||
|
||||
@@ -6,8 +6,8 @@
|
||||
description = "A horde of mice arrives, and perhaps even the Rat King themselves."
|
||||
|
||||
/datum/round_event/mice_migration
|
||||
var/minimum_mice = 3
|
||||
var/maximum_mice = 8
|
||||
var/minimum_mice = 3 //GS13 Edit: 5 to 3, mice ravage the station in lowpop
|
||||
var/maximum_mice = 8 //GS13 Edit: 15 to 8, See above.
|
||||
|
||||
/datum/round_event/mice_migration/announce(fake)
|
||||
var/cause = pick("space-winter", "budget-cuts", "Ragnarok",
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
#define SNACK_ATTACK 1 //GS13
|
||||
#define HIJACK_SYNDIE 2
|
||||
#define RUSKY_PARTY 3
|
||||
#define SPIDER_GIFT 4
|
||||
#define DEPARTMENT_RESUPPLY 5
|
||||
#define ANTIDOTE_NEEDED 6
|
||||
#define PIZZA_DELIVERY 7
|
||||
#define ITS_HIP_TO 8
|
||||
#define MY_GOD_JC 9
|
||||
#define DELTA_CRATES 10
|
||||
#define HIJACK_SYNDIE 1
|
||||
#define RUSKY_PARTY 2
|
||||
#define SPIDER_GIFT 3
|
||||
#define DEPARTMENT_RESUPPLY 4
|
||||
#define ANTIDOTE_NEEDED 5
|
||||
#define PIZZA_DELIVERY 6
|
||||
#define ITS_HIP_TO 7
|
||||
#define MY_GOD_JC 8
|
||||
#define DELTA_CRATES 9
|
||||
#define SNACK_ATTACK 10 //GS13 Add: Snack attack
|
||||
|
||||
/datum/round_event_control/shuttle_loan
|
||||
name = "Shuttle Loan"
|
||||
typepath = /datum/round_event/shuttle_loan
|
||||
max_occurrences = 3
|
||||
max_occurrences = 20 //GS13 Edit: increasing this because they're a fun event
|
||||
earliest_start = 15 MINUTES
|
||||
category = EVENT_CATEGORY_BUREAUCRATIC
|
||||
description = "If cargo accepts the offer, fills the shuttle with loot and/or enemies."
|
||||
@@ -26,16 +26,13 @@
|
||||
var/thanks_msg = "The cargo shuttle should return in five minutes. Have some supply points for your trouble."
|
||||
|
||||
/datum/round_event/shuttle_loan/setup()
|
||||
dispatch_type = pick(HIJACK_SYNDIE, RUSKY_PARTY, SPIDER_GIFT, DEPARTMENT_RESUPPLY, ANTIDOTE_NEEDED, PIZZA_DELIVERY, ITS_HIP_TO, MY_GOD_JC)
|
||||
dispatch_type = pick(HIJACK_SYNDIE, RUSKY_PARTY, SPIDER_GIFT, DEPARTMENT_RESUPPLY, ANTIDOTE_NEEDED, PIZZA_DELIVERY, ITS_HIP_TO, MY_GOD_JC, SNACK_ATTACK) //GS13 Edit: Snack Attack shuttle
|
||||
|
||||
/datum/round_event/shuttle_loan/announce(fake)
|
||||
SSshuttle.shuttle_loan = src
|
||||
var/message = "Cargo: I just wanna tell you techs good luck, we are all counting on you."
|
||||
var/title = "CentCom Free Real Estate"
|
||||
switch(dispatch_type)
|
||||
if(SNACK_ATTACK) //GS13
|
||||
message = "Cargo: Our science division took couple too many samples from one the local candy biohabitats. Would you care to dispose of the unneeded specimen?"
|
||||
title = "CentCom Science Division"
|
||||
if(HIJACK_SYNDIE)
|
||||
message = "Cargo: The syndicate are trying to infiltrate your station. If you let them hijack your cargo shuttle, you'll save us a headache."
|
||||
title = "CentCom Counter Intelligence"
|
||||
@@ -66,6 +63,11 @@
|
||||
message = "Cargo: We have discovered a warehouse of DELTA locked crates. We can't store any more of them at CC, can you take them for us?"
|
||||
title = "CentCom Security Division"
|
||||
bonus_points = 25000 //If you mess up, people die and the shuttle gets turned into swiss cheese
|
||||
//GS13 Start: Snack Attack shuttle
|
||||
if(SNACK_ATTACK)
|
||||
message = "Cargo: Our science division took couple too many samples from one the local candy biohabitats. Would you care to dispose of the unneeded specimen?"
|
||||
title = "CentCom Science Division"
|
||||
//GS13 End
|
||||
if(prob(50))
|
||||
priority_announce(message, title)
|
||||
else
|
||||
@@ -85,8 +87,6 @@
|
||||
SSshuttle.supply.setTimer(3000)
|
||||
|
||||
switch(dispatch_type)
|
||||
if(SNACK_ATTACK) //GS13
|
||||
SSshuttle.centcom_message += "Snack attack en route."
|
||||
if(HIJACK_SYNDIE)
|
||||
SSshuttle.centcom_message += "Syndicate hijack team incoming."
|
||||
if(RUSKY_PARTY)
|
||||
@@ -105,6 +105,10 @@
|
||||
SSshuttle.centcom_message += "Live explosive ordnance incoming. Exercise extreme caution."
|
||||
if(DELTA_CRATES)
|
||||
SSshuttle.centcom_message += "DELTA Locked crates incoming. Exercise extreme caution."
|
||||
//GS13 Start: Snack attack shuttle
|
||||
if(SNACK_ATTACK)
|
||||
SSshuttle.centcom_message += "Snack attack en route."
|
||||
//GS13 End
|
||||
|
||||
/datum/round_event/shuttle_loan/tick()
|
||||
if(dispatched)
|
||||
@@ -131,19 +135,6 @@
|
||||
|
||||
var/list/shuttle_spawns = list()
|
||||
switch(dispatch_type)
|
||||
if(SNACK_ATTACK) //GS13
|
||||
shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime)
|
||||
shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime)
|
||||
shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast)
|
||||
if(prob(50))
|
||||
shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast)
|
||||
|
||||
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco)
|
||||
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco)
|
||||
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco)
|
||||
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/chocoorange)
|
||||
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/chocoorange)
|
||||
shuttle_spawns.Add(/obj/item/paper/fluff/chocoslime_research)
|
||||
if(HIJACK_SYNDIE)
|
||||
var/datum/supply_pack/pack = SSshuttle.supply_packs[/datum/supply_pack/emergency/specialops]
|
||||
pack.generate(pick_n_take(empty_shuttle_turfs))
|
||||
@@ -270,6 +261,21 @@
|
||||
var/turf/T = pick_n_take(empty_shuttle_turfs)
|
||||
new /obj/structure/spider/stickyweb(T)
|
||||
new /obj/effect/decal/cleanable/ash(T)
|
||||
//GS13 Start: Snack Attack Shuttle
|
||||
if(SNACK_ATTACK) //GS13
|
||||
shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime)
|
||||
shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime)
|
||||
shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast)
|
||||
if(prob(50))
|
||||
shuttle_spawns.Add(/mob/living/simple_animal/hostile/feed/chocolate_slime/creambeast)
|
||||
|
||||
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco)
|
||||
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco)
|
||||
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/donut/choco)
|
||||
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/chocoorange)
|
||||
shuttle_spawns.Add(/obj/item/reagent_containers/food/snacks/chocoorange)
|
||||
shuttle_spawns.Add(/obj/item/paper/fluff/chocoslime_research)
|
||||
//GS13 End
|
||||
|
||||
var/false_positive = 0
|
||||
while(shuttle_spawns.len && empty_shuttle_turfs.len)
|
||||
@@ -315,3 +321,4 @@
|
||||
#undef ITS_HIP_TO
|
||||
#undef MY_GOD_JC
|
||||
#undef DELTA_CRATES
|
||||
#undef SNACK_ATTACK //GS13 Add: Snack attack
|
||||
|
||||
@@ -15,19 +15,23 @@
|
||||
var/list/vents = list()
|
||||
var/randomProbability = 0
|
||||
var/reagentsAmount = 100
|
||||
var/list/saferChems = list( //GS13 - removed some of those chems, just a couple particularly annoying ones
|
||||
var/list/saferChems = list(
|
||||
/datum/reagent/water,
|
||||
/datum/reagent/carbon,
|
||||
/datum/reagent/consumable/flour,
|
||||
/datum/reagent/space_cleaner,
|
||||
/datum/reagent/consumable/nutriment,
|
||||
/datum/reagent/consumable/condensedcapsaicin,
|
||||
/datum/reagent/drug/mushroomhallucinogen,
|
||||
/datum/reagent/lube,
|
||||
/datum/reagent/glitter/pink,
|
||||
/datum/reagent/glitter/pink_subtle, //GS13 Add: Add our subtle variants of glitter.
|
||||
/datum/reagent/cryptobiolin,
|
||||
//datum/reagent/toxin/plantbgone, //GS13 Remove: Annoying Reagent
|
||||
/datum/reagent/blood,
|
||||
/datum/reagent/medicine/charcoal,
|
||||
/datum/reagent/drug/space_drugs,
|
||||
/datum/reagent/medicine/morphine,
|
||||
/datum/reagent/water/holywater,
|
||||
/datum/reagent/consumable/ethanol,
|
||||
/datum/reagent/consumable/hot_coco,
|
||||
@@ -47,6 +51,7 @@
|
||||
/datum/reagent/hair_dye,
|
||||
/datum/reagent/consumable/sugar,
|
||||
/datum/reagent/glitter/white,
|
||||
/datum/reagent/glitter/white_subtle, //GS13 ADD: Add our subtle variants of glitter. ...Why is this separate from the other glitter, anyhow? Blue glitter's also missing, so I wont add it.
|
||||
/datum/reagent/growthserum,
|
||||
/datum/reagent/consumable/cornoil,
|
||||
/datum/reagent/uranium,
|
||||
@@ -112,7 +117,7 @@
|
||||
|
||||
/datum/round_event/vent_clog/threatening
|
||||
randomProbability = 10
|
||||
reagentsAmount = 100
|
||||
reagentsAmount = 200
|
||||
|
||||
/datum/round_event_control/vent_clog/catastrophic
|
||||
name = "Clogged Vents: Catastrophic"
|
||||
|
||||
@@ -18,7 +18,7 @@
|
||||
var/card_face = "cas_white"
|
||||
var/blanks = 25
|
||||
var/decksize = 150
|
||||
var/card_text_file = "strings/cas_white.txt"
|
||||
var/card_text_file = "GainStation13/strings/cas_white.txt" //GS13 Edit: Nanotrasen to GATO
|
||||
var/list/allcards = list()
|
||||
|
||||
/obj/item/toy/cards/deck/cas/black
|
||||
@@ -29,10 +29,10 @@
|
||||
card_face = "cas_black"
|
||||
blanks = 0
|
||||
decksize = 50
|
||||
card_text_file = "strings/cas_black.txt"
|
||||
card_text_file = "GainStation13/strings/cas_black.txt" //GS13 Edit: Nanotrasen to GATO
|
||||
|
||||
/obj/item/toy/cards/deck/cas/populate_deck()
|
||||
var/static/list/cards_against_space = list("cas_white" = world.file2list("strings/cas_white.txt"),"cas_black" = world.file2list("strings/cas_black.txt"))
|
||||
var/static/list/cards_against_space = list("cas_white" = world.file2list("GainStation13/strings/cas_white.txt"),"cas_black" = world.file2list("GainStation13/strings/cas_black.txt")) //GS13 Edit: Nanotrasen to GATO
|
||||
allcards = cards_against_space[card_face]
|
||||
var/list/possiblecards = allcards.Copy()
|
||||
if(possiblecards.len < decksize) // sanity check
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
/mob/living/simple_animal/jacq
|
||||
name = "Jacqueline the Pumpqueen"
|
||||
real_name = "Jacqueline"
|
||||
icon = 'GainStation13/icons/obj/halloween_items.dmi'
|
||||
icon = 'GainStation13/icons/obj/halloween_items.dmi' //GS13 Edit: Fat Jacqueline
|
||||
icon_state = "jacqueline"
|
||||
maxHealth = 25
|
||||
health = 25
|
||||
|
||||
@@ -66,7 +66,7 @@
|
||||
|
||||
if(mob_size == MOB_SIZE_LARGE)
|
||||
cuff_icon += "_[caste]"
|
||||
dmi_file = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites
|
||||
dmi_file = 'GainStation13/icons/mob/alienqueen.dmi' //GS13 Edit: Adding our handcuff icons to the aliens.
|
||||
|
||||
var/mutable_appearance/cuffs = mutable_appearance(dmi_file, cuff_icon, -HANDCUFF_LAYER)
|
||||
cuffs.color = handcuffed.color
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/mob/living/carbon/alien/humanoid/royal
|
||||
//Common stuffs for Praetorian and Queen
|
||||
icon = 'hyperstation/icons/mobs/alienqueen.dmi'
|
||||
icon = 'icons/mob/alienqueen.dmi'
|
||||
status_flags = 0
|
||||
unique_name = 0
|
||||
pixel_x = -16
|
||||
@@ -17,7 +17,7 @@
|
||||
meleeSlashHumanPower = 30
|
||||
meleeSlashSAPower = 60
|
||||
|
||||
var/alt_inhands_file = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites
|
||||
var/alt_inhands_file = 'icons/mob/alienqueen.dmi'
|
||||
|
||||
/mob/living/carbon/alien/humanoid/royal/can_inject(mob/user, error_msg, target_zone, penetrate_thick = FALSE, bypass_immunity = FALSE)
|
||||
return FALSE
|
||||
|
||||
@@ -145,7 +145,7 @@
|
||||
|
||||
/mob/living/simple_animal/hostile/alien/queen/large
|
||||
name = "alien empress"
|
||||
icon = 'hyperstation/icons/mobs/alienqueen.dmi' //GS13 - moving over Hyper sprites
|
||||
icon = 'icons/mob/alienqueen.dmi'
|
||||
icon_state = "alienq"
|
||||
icon_living = "alienq"
|
||||
icon_dead = "alienq_dead"
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
spacewalk = TRUE
|
||||
var/armored = FALSE
|
||||
|
||||
obj_damage = 20
|
||||
obj_damage = 60
|
||||
melee_damage_lower = 15 // i know it's like half what it used to be, but bears cause bleeding like crazy now so it works out
|
||||
melee_damage_upper = 15
|
||||
wound_bonus = -5
|
||||
|
||||
Reference in New Issue
Block a user