From b3b490ff0a59e8c6e293c1cb74d3a1b0e1604435 Mon Sep 17 00:00:00 2001 From: lass9030 Date: Sun, 6 Jan 2019 00:37:54 +0100 Subject: [PATCH 01/14] all_option --- code/modules/mob/dead/observer/observer.dm | 31 +++++++++++++++------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index cb2bc013154..baec4653166 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -297,30 +297,43 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp /mob/dead/observer/proc/show_me_the_hud(hud_index) var/datum/atom_hud/H = huds[hud_index] H.add_hud_to(src) - data_hud_seen = hud_index + +/mob/dead/observer/proc/remove_the_hud(hud_index) //remove old huds + var/datum/atom_hud/H = huds[hud_index] + H.remove_hud_from(src) /mob/dead/observer/verb/toggle_medHUD() set category = "Ghost" - set name = "Toggle Medic/Sec/DiagHUD" - set desc = "Toggles the medical HUD." + set name = "Toggle Medic/Sec/Diag/All HUDs" + set desc = "Toggles the HUDs." if(!client) return - if(data_hud_seen) //remove old huds - var/datum/atom_hud/H = huds[data_hud_seen] - H.remove_hud_from(src) switch(data_hud_seen) //give new huds if(0) + data_hud_seen = 1 show_me_the_hud(DATA_HUD_SECURITY_ADVANCED) to_chat(src, "Security HUD set.") - if(DATA_HUD_SECURITY_ADVANCED) + if(1) + data_hud_seen = 2 + remove_the_hud(DATA_HUD_SECURITY_ADVANCED) show_me_the_hud(DATA_HUD_MEDICAL_ADVANCED) to_chat(src, "Medical HUD set.") - if(DATA_HUD_MEDICAL_ADVANCED) + if(2) + data_hud_seen = 3 + remove_the_hud(DATA_HUD_MEDICAL_ADVANCED) show_me_the_hud(DATA_HUD_DIAGNOSTIC) to_chat(src, "Diagnostic HUD set.") - if(DATA_HUD_DIAGNOSTIC) + if(3) + data_hud_seen = 4 + show_me_the_hud(DATA_HUD_SECURITY_ADVANCED) + show_me_the_hud(DATA_HUD_MEDICAL_ADVANCED) + to_chat(src, "All HUDs enabled.") + if(4) data_hud_seen = 0 + remove_the_hud(DATA_HUD_DIAGNOSTIC) + remove_the_hud(DATA_HUD_SECURITY_ADVANCED) + remove_the_hud(DATA_HUD_MEDICAL_ADVANCED) to_chat(src, "HUDs disabled.") From af1f5cc97675019c4d353cfb3c4226b2935c7906 Mon Sep 17 00:00:00 2001 From: lass9030 Date: Sun, 6 Jan 2019 00:56:43 +0100 Subject: [PATCH 02/14] a plus met a plus... --- code/modules/mob/dead/observer/observer.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index baec4653166..6aee9031547 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -311,21 +311,21 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp switch(data_hud_seen) //give new huds if(0) - data_hud_seen = 1 + data_hud_seen++ show_me_the_hud(DATA_HUD_SECURITY_ADVANCED) to_chat(src, "Security HUD set.") if(1) - data_hud_seen = 2 + data_hud_seen++ remove_the_hud(DATA_HUD_SECURITY_ADVANCED) show_me_the_hud(DATA_HUD_MEDICAL_ADVANCED) to_chat(src, "Medical HUD set.") if(2) - data_hud_seen = 3 + data_hud_seen++ remove_the_hud(DATA_HUD_MEDICAL_ADVANCED) show_me_the_hud(DATA_HUD_DIAGNOSTIC) to_chat(src, "Diagnostic HUD set.") if(3) - data_hud_seen = 4 + data_hud_seen++ show_me_the_hud(DATA_HUD_SECURITY_ADVANCED) show_me_the_hud(DATA_HUD_MEDICAL_ADVANCED) to_chat(src, "All HUDs enabled.") From 7931c03c6f03556e669e6a750eb1ea43a85b23ee Mon Sep 17 00:00:00 2001 From: lass9030 Date: Sun, 6 Jan 2019 03:00:22 +0100 Subject: [PATCH 03/14] shift to count defines --- code/modules/mob/dead/observer/observer.dm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 6aee9031547..f5a03155140 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -311,25 +311,24 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp switch(data_hud_seen) //give new huds if(0) - data_hud_seen++ + data_hud_seen = DATA_HUD_SECURITY_ADVANCED show_me_the_hud(DATA_HUD_SECURITY_ADVANCED) to_chat(src, "Security HUD set.") - if(1) - data_hud_seen++ + if(DATA_HUD_SECURITY_ADVANCED) + data_hud_seen = DATA_HUD_MEDICAL_ADVANCED remove_the_hud(DATA_HUD_SECURITY_ADVANCED) show_me_the_hud(DATA_HUD_MEDICAL_ADVANCED) to_chat(src, "Medical HUD set.") - if(2) - data_hud_seen++ + if(DATA_HUD_MEDICAL_ADVANCED) + data_hud_seen = DATA_HUD_DIAGNOSTIC remove_the_hud(DATA_HUD_MEDICAL_ADVANCED) show_me_the_hud(DATA_HUD_DIAGNOSTIC) to_chat(src, "Diagnostic HUD set.") - if(3) - data_hud_seen++ + if(DATA_HUD_DIAGNOSTIC) show_me_the_hud(DATA_HUD_SECURITY_ADVANCED) show_me_the_hud(DATA_HUD_MEDICAL_ADVANCED) to_chat(src, "All HUDs enabled.") - if(4) + else data_hud_seen = 0 remove_the_hud(DATA_HUD_DIAGNOSTIC) remove_the_hud(DATA_HUD_SECURITY_ADVANCED) From f45977273bad4745075750e10be3f79b7aea35a0 Mon Sep 17 00:00:00 2001 From: lass9030 Date: Sun, 6 Jan 2019 03:14:01 +0100 Subject: [PATCH 04/14] Woops. Unfugged it. --- code/modules/mob/dead/observer/observer.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index f5a03155140..9c429944854 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -25,7 +25,7 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi var/image/ghostimage = null //this mobs ghost image, for deleting and stuff var/ghostvision = 1 //is the ghost able to see things humans can't? var/seedarkness = 1 - var/data_hud_seen = 0 //this should one of the defines in __DEFINES/hud.dm + var/data_hud_seen = FALSE //this should one of the defines in __DEFINES/hud.dm /mob/dead/observer/New(var/mob/body=null, var/flags=1) sight |= SEE_TURFS | SEE_MOBS | SEE_OBJS | SEE_SELF @@ -310,7 +310,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp return switch(data_hud_seen) //give new huds - if(0) + if(FALSE) data_hud_seen = DATA_HUD_SECURITY_ADVANCED show_me_the_hud(DATA_HUD_SECURITY_ADVANCED) to_chat(src, "Security HUD set.") @@ -325,11 +325,12 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp show_me_the_hud(DATA_HUD_DIAGNOSTIC) to_chat(src, "Diagnostic HUD set.") if(DATA_HUD_DIAGNOSTIC) + data_hud_seen = data_hud_seen + DATA_HUD_SECURITY_ADVANCED + DATA_HUD_MEDICAL_ADVANCED show_me_the_hud(DATA_HUD_SECURITY_ADVANCED) show_me_the_hud(DATA_HUD_MEDICAL_ADVANCED) to_chat(src, "All HUDs enabled.") else - data_hud_seen = 0 + data_hud_seen = FALSE remove_the_hud(DATA_HUD_DIAGNOSTIC) remove_the_hud(DATA_HUD_SECURITY_ADVANCED) remove_the_hud(DATA_HUD_MEDICAL_ADVANCED) From b330ca60bee54f94f79aa1d782ab99416882fcd9 Mon Sep 17 00:00:00 2001 From: Spartan6 Date: Sun, 6 Jan 2019 16:25:41 +0000 Subject: [PATCH 05/14] Reduces the cost of Nanocalcium to 4 --- code/datums/uplink_item.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index e9c6ed12c8e..533f1f1feb7 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -1099,7 +1099,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) desc = "Stolen prototype bone repair nanites. Contains one nanocalcium autoinjector and guide." reference = "NCAI" item = /obj/item/storage/box/syndie_kit/bonerepair - cost = 6 + cost = 4 /datum/uplink_item/device_tools/traitor_belt name = "Traitor's Toolbelt" From b00d85edf97f93aaff92766ca861c6f22ccdd1a7 Mon Sep 17 00:00:00 2001 From: AzuleUtama <44248086+AzuleUtama@users.noreply.github.com> Date: Sun, 6 Jan 2019 21:32:23 +0000 Subject: [PATCH 06/14] Renames and reorders ammunition in uplink --- code/datums/uplink_item.dm | 96 +++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm index 9eace6f7c1d..d54fafff1af 100644 --- a/code/datums/uplink_item.dm +++ b/code/datums/uplink_item.dm @@ -531,14 +531,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) item = /obj/item/batterer cost = 5 -/datum/uplink_item/ammo/bioterror - name = "Box of Bioterror Syringes" - desc = "A box full of preloaded syringes, containing various chemicals that seize up the victim's motor and broca system , making it impossible for them to move or speak while in their system." - reference = "BTS" - item = /obj/item/storage/box/syndie_kit/bioterror - cost = 5 - gamemodes = list(/datum/game_mode/nuclear) - /datum/uplink_item/dangerous/gygax name = "Gygax Exosuit" desc = "A lightweight exosuit, painted in a dark scheme. Its speed and equipment selection make it excellent for hit-and-run style attacks. \ @@ -588,15 +580,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) gamemodes = list(/datum/game_mode/nuclear) surplus = 0 -/datum/uplink_item/ammo/toydarts - name = "Box of Riot Darts" - desc = "A box of 40 Donksoft foam riot darts, for reloading any compatible foam dart gun. Don't forget to share!" - reference = "FOAM" - item = /obj/item/ammo_box/foambox/riot - cost = 2 - gamemodes = list(/datum/game_mode/nuclear) - surplus = 0 - /datum/uplink_item/dangerous/guardian name = "Holoparasites" desc = "Though capable of near sorcerous feats via use of hardlight holograms and nanomachines, they require an organic host as a home base and source of fuel. \ @@ -615,50 +598,35 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) surplus = 40 /datum/uplink_item/ammo/pistol - name = "Magazine - 10mm" + name = "Stechkin - 10mm Magazine" desc = "An additional 8-round 10mm magazine for use in the syndicate pistol, loaded with rounds that are cheap but around half as effective as .357" reference = "10MM" item = /obj/item/ammo_box/magazine/m10mm cost = 1 /datum/uplink_item/ammo/pistolap - name = "Magazine - 10mm Armour Piercing" + name = "Stechkin - 10mm Armour Piercing Magazine" desc = "An additional 8-round 10mm magazine for use in the syndicate pistol, loaded with rounds that are less effective at injuring the target but penetrate protective gear." reference = "10MMAP" item = /obj/item/ammo_box/magazine/m10mm/ap cost = 2 /datum/uplink_item/ammo/pistolfire - name = "Magazine - 10mm Incendiary" + name = "Stechkin - 10mm Incendiary Magazine" desc = "An additional 8-round 10mm magazine for use in the syndicate pistol, loaded with incendiary rounds which ignite the target." reference = "10MMFIRE" item = /obj/item/ammo_box/magazine/m10mm/fire cost = 2 /datum/uplink_item/ammo/pistolhp - name = "Magazine - 10mm Hollow Point" + name = "Stechkin - 10mm Hollow Point Magazine" desc = "An additional 8-round 10mm magazine for use in the syndicate pistol, loaded with rounds which are more damaging but ineffective against armour." reference = "10MMHP" item = /obj/item/ammo_box/magazine/m10mm/hp cost = 3 -/datum/uplink_item/ammo/revolver - name = "Speed Loader - .357" - desc = "A speed loader that contains seven additional .357 Magnum rounds for the syndicate revolver. For when you really need a lot of things dead." - reference = "357" - item = /obj/item/ammo_box/a357 - cost = 3 - -/datum/uplink_item/ammo/smg - name = "Magazine - .45" - desc = "An additional 20-round .45 magazine for use in the C-20r submachine gun. These bullets pack a lot of punch that can knock most targets down, but do limited overall damage." - reference = "45" - item = /obj/item/ammo_box/magazine/smgm45 - cost = 2 - gamemodes = list(/datum/game_mode/nuclear) - /datum/uplink_item/ammo/ammobag - name = "Ammo Duffelbag - Shotgun Ammo Grab Bag" + name = "Bulldog - Shotgun Ammo Grab Bag" desc = "A duffelbag filled with Bulldog ammo to kit out an entire team, at a discounted price." reference = "SAGL" item = /obj/item/storage/backpack/duffel/syndie/ammo/loaded @@ -666,7 +634,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) gamemodes = list(/datum/game_mode/nuclear) /datum/uplink_item/ammo/bullslug - name = "Drum Magazine - 12g Slugs" + name = "Bulldog - 12g Slug Magazine" desc = "An additional 8-round slug magazine for use in the Bulldog shotgun. Now 8 times less likely to shoot your pals." reference = "12BSG" item = /obj/item/ammo_box/magazine/m12g @@ -674,7 +642,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) gamemodes = list(/datum/game_mode/nuclear) /datum/uplink_item/ammo/bullbuck - name = "Drum Magazine - 12g buckshot" + name = "Bulldog - 12g Buckshot Magazine" desc = "An additional 8-round buckshot magazine for use in the Bulldog shotgun. Front towards enemy." reference = "12BS" item = /obj/item/ammo_box/magazine/m12g/buckshot @@ -682,7 +650,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) gamemodes = list(/datum/game_mode/nuclear) /datum/uplink_item/ammo/bullstun - name = "Drum Magazine - 12g Stun Slug" + name = "Bulldog - 12g Stun Slug Magazine" desc = "An alternative 8-round stun slug magazine for use in the Bulldog shotgun. Saying that they're completely non-lethal would be lying." reference = "12SS" item = /obj/item/ammo_box/magazine/m12g/stun @@ -690,15 +658,23 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) gamemodes = list(/datum/game_mode/nuclear) /datum/uplink_item/ammo/bulldragon - name = "Drum Magazine - 12g Dragon's Breath" + name = "Bulldog - 12g Dragon's Breath Magazine" desc = "An alternative 8-round dragon's breath magazine for use in the Bulldog shotgun. I'm a fire starter, twisted fire starter!" reference = "12DB" item = /obj/item/ammo_box/magazine/m12g/dragon cost = 2 gamemodes = list(/datum/game_mode/nuclear) +/datum/uplink_item/ammo/smg + name = "C-20r - .45 Magazine" + desc = "An additional 20-round .45 magazine for use in the C-20r submachine gun. These bullets pack a lot of punch that can knock most targets down, but do limited overall damage." + reference = "45" + item = /obj/item/ammo_box/magazine/smgm45 + cost = 2 + gamemodes = list(/datum/game_mode/nuclear) + /datum/uplink_item/ammo/carbine - name = "Toploader Magazine - 5.56" + name = "Carbine - 5.56 Toploader Magazine" desc = "An additional 30-round 5.56 magazine for use in the M-90gl carbine. These bullets don't have the punch to knock most targets down, but dish out higher overall damage." reference = "556" item = /obj/item/ammo_box/magazine/m556 @@ -706,7 +682,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) gamemodes = list(/datum/game_mode/nuclear) /datum/uplink_item/ammo/a40mm - name = "Ammo Box - 40mm grenades" + name = "Carbine - 40mm Grenade Ammo Box" desc = "A box of 4 additional 40mm HE grenades for use the C-90gl's underbarrel grenade launcher. Your teammates will thank you to not shoot these down small hallways." reference = "40MM" item = /obj/item/ammo_box/a40mm @@ -714,7 +690,7 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) gamemodes = list(/datum/game_mode/nuclear) /datum/uplink_item/ammo/machinegun - name = "Box Magazine - 5.56x45mm" + name = "L6 SAW - 5.56x45mm Box Magazine" desc = "A 50-round magazine of 5.56x45mm ammunition for use in the L6 SAW machine gun. By the time you need to use this, you'll already be on a pile of corpses." reference = "762" item = /obj/item/ammo_box/magazine/mm556x45 @@ -727,33 +703,57 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) gamemodes = list(/datum/game_mode/nuclear) /datum/uplink_item/ammo/sniper/basic - name = ".50 Magazine" + name = "Sniper - .50 Magazine" desc = "An additional standard 6-round magazine for use with .50 sniper rifles." reference = "50M" item = /obj/item/ammo_box/magazine/sniper_rounds /datum/uplink_item/ammo/sniper/soporific - name = ".50 Soporific Magazine" + name = "Sniper - .50 Soporific Magazine" desc = "A 3-round magazine of soporific ammo designed for use with .50 sniper rifles. Put your enemies to sleep today!" reference = "50S" item = /obj/item/ammo_box/magazine/sniper_rounds/soporific cost = 3 /datum/uplink_item/ammo/sniper/haemorrhage - name = ".50 Haemorrhage Magazine" + name = "Sniper - .50 Haemorrhage Magazine" desc = "A 5-round magazine of haemorrhage ammo designed for use with .50 sniper rifles; causes heavy bleeding \ in the target." reference = "50B" item = /obj/item/ammo_box/magazine/sniper_rounds/haemorrhage /datum/uplink_item/ammo/sniper/penetrator - name = ".50 Penetrator Magazine" + name = "Sniper - .50 Penetrator Magazine" desc = "A 5-round magazine of penetrator ammo designed for use with .50 sniper rifles. \ Can pierce walls and multiple enemies." reference = "50P" item = /obj/item/ammo_box/magazine/sniper_rounds/penetrator cost = 5 +/datum/uplink_item/ammo/bioterror + name = "Box of Bioterror Syringes" + desc = "A box full of preloaded syringes, containing various chemicals that seize up the victim's motor and broca system , making it impossible for them to move or speak while in their system." + reference = "BTS" + item = /obj/item/storage/box/syndie_kit/bioterror + cost = 5 + gamemodes = list(/datum/game_mode/nuclear) + +/datum/uplink_item/ammo/toydarts + name = "Box of Riot Darts" + desc = "A box of 40 Donksoft foam riot darts, for reloading any compatible foam dart gun. Don't forget to share!" + reference = "FOAM" + item = /obj/item/ammo_box/foambox/riot + cost = 2 + gamemodes = list(/datum/game_mode/nuclear) + surplus = 0 + +/datum/uplink_item/ammo/revolver + name = ".357 Revolver - Speedloader" + desc = "A speed loader that contains seven additional .357 Magnum rounds for the syndicate revolver. For when you really need a lot of things dead." + reference = "357" + item = /obj/item/ammo_box/a357 + cost = 3 + // STEALTHY WEAPONS /datum/uplink_item/stealthy_weapons From d3707919b684d39a65decf0cdac8fce8f6309d3e Mon Sep 17 00:00:00 2001 From: datlo Date: Mon, 7 Jan 2019 16:30:23 +0000 Subject: [PATCH 07/14] fix state bug --- code/modules/mob/living/carbon/human/say.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/say.dm b/code/modules/mob/living/carbon/human/say.dm index 80d0de56cfc..4d97ddfd78a 100644 --- a/code/modules/mob/living/carbon/human/say.dm +++ b/code/modules/mob/living/carbon/human/say.dm @@ -109,7 +109,7 @@ /mob/living/carbon/human/handle_speech_problems(list/message_pieces, var/verb) var/span = "" - var/obj/item/organ/internal/cyberimp/brain/speech_translator/translator = locate(/obj/item/organ/internal/cyberimp/brain/speech_translator) + var/obj/item/organ/internal/cyberimp/brain/speech_translator/translator = locate(/obj/item/organ/internal/cyberimp/brain/speech_translator) in internal_organs if(translator) if(translator.active) span = translator.speech_span From 40d99fa8001f11ca979242201a4e7389baf9c673 Mon Sep 17 00:00:00 2001 From: datlo Date: Mon, 7 Jan 2019 18:11:13 +0000 Subject: [PATCH 08/14] Fixes BSA size --- code/__DEFINES/station_goals.dm | 8 ++++++++ code/modules/station_goals/bsa.dm | 9 +++++---- code/modules/station_goals/dna_vault.dm | 7 +------ paradise.dme | 3 ++- 4 files changed, 16 insertions(+), 11 deletions(-) create mode 100644 code/__DEFINES/station_goals.dm diff --git a/code/__DEFINES/station_goals.dm b/code/__DEFINES/station_goals.dm new file mode 100644 index 00000000000..ce1723e6521 --- /dev/null +++ b/code/__DEFINES/station_goals.dm @@ -0,0 +1,8 @@ +#define BSA_SIZE_FRONT 4 +#define BSA_SIZE_BACK 6 + +#define VAULT_SPACEIMMUNE "Space Immunity" +#define VAULT_XRAY "X-Ray Vision" +#define VAULT_TELEKINESIS "Telekinesis" +#define VAULT_PSYCHIC "Psychic Powers" +#define VAULT_SPEED "Speediness" \ No newline at end of file diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm index 9f8b866981c..b6a6ff770f1 100644 --- a/code/modules/station_goals/bsa.dm +++ b/code/modules/station_goals/bsa.dm @@ -2,6 +2,7 @@ // Cargo orders part for high price // Requires high amount of power // Requires high level stock parts + /datum/station_goal/bluespace_cannon name = "Bluespace Artillery" @@ -104,11 +105,11 @@ var/x_max switch(cannon_dir) if(EAST) - x_min = x - 4 //replace with defines later - x_max = x + 6 + x_min = x - BSA_SIZE_BACK + x_max = x + BSA_SIZE_FRONT if(WEST) - x_min = x + 4 - x_max = x - 6 + x_min = x + BSA_SIZE_BACK + x_max = x - BSA_SIZE_FRONT for(var/turf/T in block(locate(x_min,y-1,z),locate(x_max,y+1,z))) if(T.density || isspaceturf(T)) diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm index 74d648dbff6..0efe2043ab0 100644 --- a/code/modules/station_goals/dna_vault.dm +++ b/code/modules/station_goals/dna_vault.dm @@ -3,11 +3,6 @@ // DNA vault requires x animals ,y plants, z human dna // DNA vaults require high tier stock parts and cold // After completion each crewmember can receive single upgrade chosen out of 2 for the mob. -#define VAULT_SPACEIMMUNE "Space Immunity" -#define VAULT_XRAY "X-Ray Vision" -#define VAULT_TELEKINESIS "Telekinesis" -#define VAULT_PSYCHIC "Psychic Powers" -#define VAULT_SPEED "Speediness" /datum/station_goal/dna_vault name = "DNA Vault" @@ -17,7 +12,7 @@ /datum/station_goal/dna_vault/New() ..() - animal_count = rand(15,20) //might be too few given ~15 roundstart stationside ones + animal_count = rand(15, 20) //might be too few given ~15 roundstart stationside ones human_count = rand(round(0.75 * ticker.mode.num_players_started()), ticker.mode.num_players_started()) // 75%+ roundstart population. var/non_standard_plants = non_standard_plants_count() plant_count = rand(round(0.5 * non_standard_plants),round(0.7 * non_standard_plants)) diff --git a/paradise.dme b/paradise.dme index f80ea688c86..49a3b73ee07 100644 --- a/paradise.dme +++ b/paradise.dme @@ -57,6 +57,7 @@ #include "code\__DEFINES\snpc.dm" #include "code\__DEFINES\sound.dm" #include "code\__DEFINES\stat.dm" +#include "code\__DEFINES\station_goals.dm" #include "code\__DEFINES\status_effects.dm" #include "code\__DEFINES\subsystems.dm" #include "code\__DEFINES\tick.dm" @@ -2350,4 +2351,4 @@ #include "goon\code\datums\browserOutput.dm" #include "interface\interface.dm" #include "interface\skin.dmf" -// END_INCLUDE \ No newline at end of file +// END_INCLUDE From 198847ddeb7e2f0733f13a36f26171c07e826aed Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 7 Jan 2019 19:08:38 -0500 Subject: [PATCH 09/14] Automatic changelog generation for PR #10611 [ci skip] --- html/changelogs/AutoChangeLog-pr-10611.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10611.yml diff --git a/html/changelogs/AutoChangeLog-pr-10611.yml b/html/changelogs/AutoChangeLog-pr-10611.yml new file mode 100644 index 00000000000..a1f4e8f29af --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10611.yml @@ -0,0 +1,4 @@ +author: "datlo" +delete-after: True +changes: + - bugfix: "Fixed grey translator translating the entire server." From 62db0353d8b20f76ccee6801d6b503c7f5d158a7 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Mon, 7 Jan 2019 19:09:12 -0500 Subject: [PATCH 10/14] Automatic changelog generation for PR #10613 [ci skip] --- html/changelogs/AutoChangeLog-pr-10613.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10613.yml diff --git a/html/changelogs/AutoChangeLog-pr-10613.yml b/html/changelogs/AutoChangeLog-pr-10613.yml new file mode 100644 index 00000000000..74c0eff1a10 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10613.yml @@ -0,0 +1,4 @@ +author: "datlo" +delete-after: True +changes: + - bugfix: "Fixed BSA size checks being reversed, causing the BSA to clip through walls or prevent construction." From 7cd2fcfcf8f0b4bcc9da0334f93a19830beb18e7 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Tue, 8 Jan 2019 00:27:23 +0000 Subject: [PATCH 11/14] Automatic changelog compile, [ci skip] --- html/changelog.html | 7 +++++++ html/changelogs/.all_changelog.yml | 5 +++++ html/changelogs/AutoChangeLog-pr-10611.yml | 4 ---- html/changelogs/AutoChangeLog-pr-10613.yml | 4 ---- 4 files changed, 12 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-10611.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-10613.yml diff --git a/html/changelog.html b/html/changelog.html index 61162a4a791..7177c49932a 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,13 @@ -->
+

08 January 2019

+

datlo updated:

+
    +
  • Fixed grey translator translating the entire server.
    • +
  • Fixed BSA size checks being reversed, causing the BSA to clip through walls or prevent construction.
    • +
+

07 January 2019

Fox McCloud updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 12cc0f4494d..9abb5616261 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -8612,3 +8612,8 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. 2019-01-07: Fox McCloud: - bugfix: Fixes auto-injectors being free parapens +2019-01-08: + datlo: + - bugfix: Fixed grey translator translating the entire server. + - bugfix: Fixed BSA size checks being reversed, causing the BSA to clip through + walls or prevent construction. diff --git a/html/changelogs/AutoChangeLog-pr-10611.yml b/html/changelogs/AutoChangeLog-pr-10611.yml deleted file mode 100644 index a1f4e8f29af..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10611.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "datlo" -delete-after: True -changes: - - bugfix: "Fixed grey translator translating the entire server." diff --git a/html/changelogs/AutoChangeLog-pr-10613.yml b/html/changelogs/AutoChangeLog-pr-10613.yml deleted file mode 100644 index 74c0eff1a10..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10613.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "datlo" -delete-after: True -changes: - - bugfix: "Fixed BSA size checks being reversed, causing the BSA to clip through walls or prevent construction." From bee70ad260d9cb9a711e29735fc3f21a3fca70ba Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Tue, 8 Jan 2019 02:48:22 -0500 Subject: [PATCH 12/14] Automatic changelog generation for PR #10606 [ci skip] --- html/changelogs/AutoChangeLog-pr-10606.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10606.yml diff --git a/html/changelogs/AutoChangeLog-pr-10606.yml b/html/changelogs/AutoChangeLog-pr-10606.yml new file mode 100644 index 00000000000..9a0c50d2c91 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10606.yml @@ -0,0 +1,4 @@ +author: "AzuleUtama" +delete-after: True +changes: + - spellcheck: "Renamed and reorganized the ammunition in the uplink to make it easier for Nuclear Operatives to find the right ammo for their gun." From 19e1b27b2ef68e33dca062f63e10f6b79a948847 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Tue, 8 Jan 2019 02:49:15 -0500 Subject: [PATCH 13/14] Automatic changelog generation for PR #10600 [ci skip] --- html/changelogs/AutoChangeLog-pr-10600.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-10600.yml diff --git a/html/changelogs/AutoChangeLog-pr-10600.yml b/html/changelogs/AutoChangeLog-pr-10600.yml new file mode 100644 index 00000000000..2c88fc4caaf --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-10600.yml @@ -0,0 +1,4 @@ +author: "Alonefromhell" +delete-after: True +changes: + - rscadd: "Added an \"All\" option to ghost hud vision." From 5f01f0da5c0b578aa1b9a28cdfab906b86f1ca80 Mon Sep 17 00:00:00 2001 From: ParadiseSS13-Bot Date: Tue, 8 Jan 2019 07:52:02 +0000 Subject: [PATCH 14/14] Automatic changelog compile, [ci skip] --- html/changelog.html | 8 ++++++++ html/changelogs/.all_changelog.yml | 5 +++++ html/changelogs/AutoChangeLog-pr-10600.yml | 4 ---- html/changelogs/AutoChangeLog-pr-10606.yml | 4 ---- 4 files changed, 13 insertions(+), 8 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-10600.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-10606.yml diff --git a/html/changelog.html b/html/changelog.html index 7177c49932a..b5d3beb2329 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -57,6 +57,14 @@

    08 January 2019

    +

    Alonefromhell updated:

    +
      +
    • Added an "All" option to ghost hud vision.
      • +
    +

    AzuleUtama updated:

    +
      +
    • Renamed and reorganized the ammunition in the uplink to make it easier for Nuclear Operatives to find the right ammo for their gun.
      • +

    datlo updated:

    • Fixed grey translator translating the entire server.
      • diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 9abb5616261..a7478c5e8e6 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -8613,6 +8613,11 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Fox McCloud: - bugfix: Fixes auto-injectors being free parapens 2019-01-08: + Alonefromhell: + - rscadd: Added an "All" option to ghost hud vision. + AzuleUtama: + - spellcheck: Renamed and reorganized the ammunition in the uplink to make it easier + for Nuclear Operatives to find the right ammo for their gun. datlo: - bugfix: Fixed grey translator translating the entire server. - bugfix: Fixed BSA size checks being reversed, causing the BSA to clip through diff --git a/html/changelogs/AutoChangeLog-pr-10600.yml b/html/changelogs/AutoChangeLog-pr-10600.yml deleted file mode 100644 index 2c88fc4caaf..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10600.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "Alonefromhell" -delete-after: True -changes: - - rscadd: "Added an \"All\" option to ghost hud vision." diff --git a/html/changelogs/AutoChangeLog-pr-10606.yml b/html/changelogs/AutoChangeLog-pr-10606.yml deleted file mode 100644 index 9a0c50d2c91..00000000000 --- a/html/changelogs/AutoChangeLog-pr-10606.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "AzuleUtama" -delete-after: True -changes: - - spellcheck: "Renamed and reorganized the ammunition in the uplink to make it easier for Nuclear Operatives to find the right ammo for their gun."