From 74c00d17f8f403a88a37f2ac08e98c8381418a09 Mon Sep 17 00:00:00 2001
From: LetterN <24603524+LetterN@users.noreply.github.com>
Date: Wed, 31 Mar 2021 09:43:15 +0800
Subject: [PATCH 01/11] let's be [redacted], its really in t his year
---
code/modules/events/pirates.dm | 127 +++++++++++++++++---------------
strings/pirates.json | 130 +++++++++++++++++++++++++--------
2 files changed, 168 insertions(+), 89 deletions(-)
diff --git a/code/modules/events/pirates.dm b/code/modules/events/pirates.dm
index 5a5df41163..c55413f52e 100644
--- a/code/modules/events/pirates.dm
+++ b/code/modules/events/pirates.dm
@@ -7,6 +7,10 @@
earliest_start = 30 MINUTES
gamemode_blacklist = list("nuclear")
+#define PIRATES_ROGUES "Rogues"
+// #define PIRATES_SILVERSCALES "Silverscales"
+// #define PIRATES_DUTCHMAN "Flying Dutchman"
+
/datum/round_event_control/pirates/preRunEvent()
if (!SSmapping.empty_space)
return EVENT_CANT_RUN
@@ -15,31 +19,54 @@
/datum/round_event/pirates
startWhen = 60 //2 minutes to answer
- var/datum/comm_message/threat_message
+ var/datum/comm_message/threat_msg
var/payoff = 0
+ var/payoff_min = 20000
var/paid_off = FALSE
+ var/pirate_type
+ var/ship_template
var/ship_name = "Space Privateers Association"
var/shuttle_spawned = FALSE
/datum/round_event/pirates/setup()
- ship_name = pick(strings(PIRATE_NAMES_FILE, "ship_names"))
+ pirate_type = PIRATES_ROGUES //pick(PIRATES_ROGUES, PIRATES_SILVERSCALES, PIRATES_DUTCHMAN)
+ switch(pirate_type)
+ if(PIRATES_ROGUES)
+ ship_name = pick(strings(PIRATE_NAMES_FILE, "rogue_names"))
+ // if(PIRATES_SILVERSCALES)
+ // ship_name = pick(strings(PIRATE_NAMES_FILE, "silverscale_names"))
+ // if(PIRATES_DUTCHMAN)
+ // ship_name = "Flying Dutchman"
/datum/round_event/pirates/announce(fake)
- priority_announce("A business proposition has been downloaded and printed out at all communication consoles.", "Incoming Business Proposition", "commandreport")
+ priority_announce("Incoming subspace communication. Secure channel opened at all communication consoles.", "Incoming Message", "commandreport")
if(fake)
return
- threat_message = new
+ threat_msg = new
var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
if(D)
- payoff = round(D.account_balance * 0.80)
- threat_message.title = "Business proposition"
- threat_message.content = "This is [ship_name]. Pay up [payoff] credits or you'll walk the plank."
- threat_message.possible_answers = list("We'll pay.","No way.")
- threat_message.answer_callback = CALLBACK(src,.proc/answered)
- SScommunications.send_message(threat_message,unique = TRUE)
+ payoff = max(payoff_min, FLOOR(D.account_balance * 0.80, 1000))
+ switch(pirate_type)
+ if(PIRATES_ROGUES)
+ ship_template = /datum/map_template/shuttle/pirate/default
+ threat_msg.title = "Sector protection offer"
+ threat_msg.content = "Hey, pal, this is the [ship_name]. Can't help but notice you're rocking a wild and crazy shuttle there with NO INSURANCE! Crazy. What if something happened to it, huh?! We've done a quick evaluation on your rates in this sector and we're offering [payoff] to cover for your shuttle in case of any disaster."
+ threat_msg.possible_answers = list("Purchase Insurance.","Reject Offer.")
+ // if(PIRATES_SILVERSCALES)
+ // ship_template = /datum/map_template/shuttle/pirate/silverscale
+ // threat_msg.title = "Tribute to high society"
+ // threat_msg.content = "This is the [ship_name]. The Silver Scales wish for some tribute from your plebeian lizards. [payoff] credits should do the trick."
+ // threat_msg.possible_answers = list("We'll pay.","Tribute? Really? Go away.")
+ // if(PIRATES_DUTCHMAN)
+ // ship_template = /datum/map_template/shuttle/pirate/dutchman
+ // threat_msg.title = "Business proposition"
+ // threat_msg.content = "Ahoy! This be the [ship_name]. Cough up [payoff] credits or you'll walk the plank."
+ // threat_msg.possible_answers = list("We'll pay.","We will not be extorted.")
+ threat_msg.answer_callback = CALLBACK(src,.proc/answered)
+ SScommunications.send_message(threat_msg,unique = TRUE)
/datum/round_event/pirates/proc/answered()
- if(threat_message && threat_message.answered == 1)
+ if(threat_msg && threat_msg.answered == 1)
var/datum/bank_account/D = SSeconomy.get_dep_account(ACCOUNT_CAR)
if(D)
if(D.adjust_money(-payoff))
@@ -49,10 +76,14 @@
else
priority_announce("Trying to cheat us? You'll regret this!",sender_override = ship_name)
if(!shuttle_spawned)
- priority_announce("You won't listen to reason? Then we'll take what's yours or die trying!",sender_override = ship_name)
spawn_shuttle()
+ else
+ priority_announce("Too late to beg for mercy!",sender_override = ship_name)
/datum/round_event/pirates/start()
+ if(threat_msg && !threat_msg.answered)
+ threat_msg.possible_answers = list("Too late")
+ threat_msg.answered = 1
if(!paid_off && !shuttle_spawned)
spawn_shuttle()
@@ -62,10 +93,7 @@
var/list/candidates = pollGhostCandidates("Do you wish to be considered for pirate crew?", ROLE_TRAITOR)
shuffle_inplace(candidates)
- if(!SSmapping.empty_space)
- SSmapping.empty_space = SSmapping.add_new_zlevel("Empty Area For Pirates", list(ZTRAIT_LINKAGE = SELFLOOPING))
-
- var/datum/map_template/shuttle/pirate/default/ship = new
+ var/datum/map_template/shuttle/pirate/ship = new ship_template
var/x = rand(TRANSITIONEDGE,world.maxx - TRANSITIONEDGE - ship.width)
var/y = rand(TRANSITIONEDGE,world.maxy - TRANSITIONEDGE - ship.height)
var/z = SSmapping.empty_space.z_value
@@ -75,6 +103,7 @@
if(!ship.load(T))
CRASH("Loading pirate ship failed!")
+
for(var/turf/A in ship.get_affected_turfs(T))
for(var/obj/effect/mob_spawn/human/pirate/spawner in A)
if(candidates.len > 0)
@@ -84,7 +113,8 @@
announce_to_ghosts(M)
else
announce_to_ghosts(spawner)
- priority_announce("Unidentified ship detected near the station.")
+
+ priority_announce("Unidentified armed ship detected near the station.")
//Shuttle equipment
@@ -145,7 +175,7 @@
new /obj/effect/temp_visual/emp(get_turf(S))
/obj/machinery/shuttle_scrambler/proc/dump_loot(mob/user)
- if(credits_stored) // Prevents spamming empty holochips
+ if(credits_stored) // Prevents spamming empty holochips
new /obj/item/holochip(drop_location(), credits_stored)
to_chat(user,"You retrieve the siphoned credits!")
credits_stored = 0
@@ -161,10 +191,8 @@
STOP_PROCESSING(SSobj,src)
/obj/machinery/shuttle_scrambler/update_icon_state()
- if(active)
- icon_state = "dominator-blue"
- else
- icon_state = "dominator"
+ icon_state = active ? "dominator-blue" : "dominator"
+ return ..()
/obj/machinery/shuttle_scrambler/Destroy()
toggle_off()
@@ -175,7 +203,6 @@
shuttleId = "pirateship"
icon_screen = "syndishuttle"
icon_keyboard = "syndie_key"
- resistance_flags = INDESTRUCTIBLE
light_color = LIGHT_COLOR_RED
possible_destinations = "pirateship_away;pirateship_home;pirateship_custom"
@@ -183,7 +210,6 @@
name = "pirate shuttle navigation computer"
desc = "Used to designate a precise transit location for the pirate shuttle."
shuttleId = "pirateship"
- resistance_flags = INDESTRUCTIBLE
lock_override = CAMERA_LOCK_STATION
shuttlePortId = "pirateship_custom"
x_offset = 9
@@ -193,41 +219,20 @@
/obj/docking_port/mobile/pirate
name = "pirate shuttle"
id = "pirateship"
- var/engines_cooling = FALSE
- var/engine_cooldown = 3 MINUTES
-
-/obj/docking_port/mobile/pirate/getStatusText()
- . = ..()
- if(engines_cooling)
- return "[.] - Engines cooling."
-
-/obj/docking_port/mobile/pirate/initiate_docking(obj/docking_port/stationary/new_dock, movement_direction, force=FALSE)
- . = ..()
- if(. == DOCKING_SUCCESS && !is_reserved_level(new_dock.z))
- engines_cooling = TRUE
- addtimer(CALLBACK(src,.proc/reset_cooldown),engine_cooldown,TIMER_UNIQUE)
-
-/obj/docking_port/mobile/pirate/proc/reset_cooldown()
- engines_cooling = FALSE
-
-/obj/docking_port/mobile/pirate/canMove()
- if(engines_cooling)
- return FALSE
- return ..()
+ rechargeTime = 3 MINUTES
/obj/machinery/suit_storage_unit/pirate
suit_type = /obj/item/clothing/suit/space
helmet_type = /obj/item/clothing/head/helmet/space
mask_type = /obj/item/clothing/mask/breath
storage_type = /obj/item/tank/jetpack/void
-
+ // storage_type = /obj/item/tank/internals/oxygen
/obj/machinery/loot_locator
name = "Booty Locator"
desc = "This sophisticated machine scans the nearby space for items of value."
icon = 'icons/obj/machines/research.dmi'
icon_state = "tdoppler"
- resistance_flags = INDESTRUCTIBLE
density = TRUE
var/cooldown = 300
var/next_use = 0
@@ -261,23 +266,20 @@
name = "cargo hold pad"
icon = 'icons/obj/telescience.dmi'
icon_state = "lpad-idle-o"
- resistance_flags = INDESTRUCTIBLE
var/idle_state = "lpad-idle-o"
var/warmup_state = "lpad-idle"
var/sending_state = "lpad-beam"
var/cargo_hold_id
-/obj/machinery/piratepad/multitool_act(mob/living/user, obj/item/I)
- if(I.tool_behaviour == TOOL_MULTITOOL)
+/obj/machinery/piratepad/multitool_act(mob/living/user, obj/item/multitool/I)
+ . = ..()
+ if (istype(I))
to_chat(user, "You register [src] in [I]s buffer.")
I.buffer = src
return TRUE
/obj/machinery/computer/piratepad_control
name = "cargo hold control terminal"
- resistance_flags = INDESTRUCTIBLE
- ui_x = 600
- ui_y = 230
var/status_report = "Ready for delivery."
var/obj/machinery/piratepad/pad
var/warmup_time = 100
@@ -291,8 +293,9 @@
..()
return INITIALIZE_HINT_LATELOAD
-/obj/machinery/computer/piratepad_control/multitool_act(mob/living/user, obj/item/I)
- if(I.tool_behaviour == TOOL_MULTITOOL && istype(I.buffer,/obj/machinery/piratepad))
+/obj/machinery/computer/piratepad_control/multitool_act(mob/living/user, obj/item/multitool/I)
+ . = ..()
+ if (istype(I) && istype(I.buffer,/obj/machinery/piratepad))
to_chat(user, "You link [src] with [I.buffer] in [I] buffer.")
pad = I.buffer
return TRUE
@@ -322,7 +325,8 @@
return data
/obj/machinery/computer/piratepad_control/ui_act(action, params)
- if(..())
+ . = ..()
+ if(.)
return
if(!pad)
return
@@ -341,6 +345,7 @@
/obj/machinery/computer/piratepad_control/proc/recalc()
if(sending)
return
+
status_report = "Predicted value: "
var/value = 0
var/datum/export_report/ex = new
@@ -386,11 +391,13 @@
for(var/datum/export/E in ex.total_amount)
total_report.total_amount[E] += ex.total_amount[E]
total_report.total_value[E] += ex.total_value[E]
+ // playsound(loc, 'sound/machines/wewewew.ogg', 70, TRUE)
points += value
if(!value)
status_report += "Nothing"
+
pad.visible_message("[pad] activates!")
flick(pad.sending_state,pad)
pad.icon_state = pad.idle_state
@@ -400,16 +407,18 @@
if(sending)
return
sending = TRUE
- status_report = "Sending..."
+ status_report = "Sending... "
pad.visible_message("[pad] starts charging up.")
pad.icon_state = pad.warmup_state
sending_timer = addtimer(CALLBACK(src,.proc/send),warmup_time, TIMER_STOPPABLE)
-/obj/machinery/computer/piratepad_control/proc/stop_sending()
+/obj/machinery/computer/piratepad_control/proc/stop_sending(custom_report)
if(!sending)
return
sending = FALSE
- status_report = "Idle"
+ status_report = "Ready for delivery."
+ if(custom_report)
+ status_report = custom_report
pad.icon_state = pad.idle_state
deltimer(sending_timer)
diff --git a/strings/pirates.json b/strings/pirates.json
index 5c90fa5d5d..ac5a96241f 100644
--- a/strings/pirates.json
+++ b/strings/pirates.json
@@ -1,31 +1,101 @@
{
- "beginnings":[
- "Star",
- "Oort",
- "Comet",
- "Pulsar",
- "Plasma",
- "Void",
- "Space",
- "Solar",
- "Laser",
- "Ion"
- ],
- "endings":[
- "keel",
- "beard",
- "bilge",
- "hull",
- "hook",
- "flag",
- "deck",
- "salt",
- "knot",
- "fish",
- "helm"
- ],
- "ship_names":[
- "Space Queen's Revenge",
- "Syndicate Privateer"
- ]
-}
\ No newline at end of file
+ "beginnings":[
+ "Comet",
+ "Ion",
+ "Laser",
+ "Oort",
+ "Plasma",
+ "Pulsar",
+ "Solar",
+ "Space",
+ "Star",
+ "Void"
+ ],
+ "endings":[
+ "beard",
+ "bilge",
+ "deck",
+ "fish",
+ "flag",
+ "helm",
+ "hook",
+ "hull",
+ "keel",
+ "knot",
+ "salt"
+ ],
+ "rogue_names":[
+ "Abyssal Titan",
+ "Ashes to Ashes",
+ "Asteroid Blaster",
+ "Asteroid Dragger",
+ "Bellowing Spacedragon",
+ "Blargbeam Solar-slider",
+ "Blood Money",
+ "Cosmic Gunboat",
+ "Customer Service",
+ "Deadman's Switch",
+ "Diplomacy Disputer",
+ "Driftbeam",
+ "Echoing Laughter",
+ "Electric Boogaloo",
+ "Fat Leg",
+ "Heaven's Cavaliers",
+ "I Am Become Death",
+ "I Love the Bomb",
+ "Ickity Pickety Startooth Knuckle Dragger",
+ "John Ship",
+ "Lizard Melter",
+ "Lost in Deep Space",
+ "Missile Rack",
+ "Moth Splatterer",
+ "New Sins for Old",
+ "One Last Job",
+ "Paint Asteroids Red",
+ "Pastafarianism",
+ "Raging Meteor",
+ "Reverse Far Leap",
+ "Scourge of the Milky Way",
+ "Silicon Policy",
+ "Space Grease",
+ "Space Justice",
+ "Space Pearl",
+ "Star Scraper",
+ "War as a Business",
+ "Xenophobia",
+ "Space Queen's Revenge",
+ "Syndicate Privateer"
+ ],
+ "silverscale_names":[
+ "Antelope's Run",
+ "Aristocrat's Principle",
+ "Aristocratic Tributary",
+ "Bane of Serfs",
+ "Benevolence of the Serpentine",
+ "Casus Belli",
+ "Celestial Lizardhawk",
+ "Divine Space Wind",
+ "Empire Sprawl",
+ "Guiding Hand",
+ "His Majesty's Chosen",
+ "Home Away from Home",
+ "Jewel of Tizira",
+ "Manifest Destiny",
+ "Necessary Evil",
+ "Pearly Gates",
+ "Pinnacle of the Stratocracy",
+ "Prince Regent",
+ "Right to Rule",
+ "Ruling Body",
+ "Serpentine Dominion",
+ "Silver Fox",
+ "Silver Sterling",
+ "Silverchain's Sovereignty",
+ "Spaceflower",
+ "Status Quo",
+ "Swords and Sandals",
+ "Thesaurus Terror",
+ "Archduke's Silver Ring",
+ "Silver Steed"
+ ]
+}
From 3760be44d916c2bf0eddb082948e853cd6f60dcc Mon Sep 17 00:00:00 2001
From: Putnam
Date: Tue, 30 Mar 2021 20:41:48 -0700
Subject: [PATCH 02/11] Added observe logging
---
code/modules/mob/dead/observer/observer.dm | 1 +
1 file changed, 1 insertion(+)
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index 783f55d12d..6c464c3cd1 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -905,6 +905,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
mob_eye.observers |= src
mob_eye.hud_used.show_hud(mob_eye.hud_used.hud_version, src)
observetarget = mob_eye
+ mob_eye.investigate_log("was observed by [src] as a ghost.", INVESTIGATE_GHOST)
/mob/dead/observer/verb/register_pai_candidate()
set category = "Ghost"
From bbde44746cff0b490aa9b62a8e2dda2f7d90beed Mon Sep 17 00:00:00 2001
From: Changelogs
Date: Thu, 1 Apr 2021 00:07:06 +0000
Subject: [PATCH 03/11] Automatic changelog compile [ci skip]
---
html/changelog.html | 7 -------
1 file changed, 7 deletions(-)
diff --git a/html/changelog.html b/html/changelog.html
index 9958a35ef6..f2c4a0822f 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -925,13 +925,6 @@
cowbell necklace happy 2021
shibari ropes & torn pantyhose
-
- 28 January 2021
- silicons updated:
-
- - colormates can now paint some mobs.
- - 1 dev explosions shouldn't delete brains anymore
-
GoonStation 13 Development Team
From d614a1561c856a140e9b3c747dfa3516dae2acb7 Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Thu, 1 Apr 2021 14:04:19 -0500
Subject: [PATCH 04/11] Automatic changelog generation for PR #14541 [ci skip]
---
html/changelogs/AutoChangeLog-pr-14541.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-14541.yml
diff --git a/html/changelogs/AutoChangeLog-pr-14541.yml b/html/changelogs/AutoChangeLog-pr-14541.yml
new file mode 100644
index 0000000000..1f0a492311
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-14541.yml
@@ -0,0 +1,4 @@
+author: "LetterN"
+delete-after: True
+changes:
+ - bugfix: "piratepayment"
From 4de7af5db595f01909d4bc57b22d84896f1064b7 Mon Sep 17 00:00:00 2001
From: Blue Wildrose
Date: Thu, 1 Apr 2021 16:31:15 -0700
Subject: [PATCH 05/11] Bumbles no longer has a number beside their name
---
code/modules/mob/living/simple_animal/friendly/bumbles.dm | 1 -
1 file changed, 1 deletion(-)
diff --git a/code/modules/mob/living/simple_animal/friendly/bumbles.dm b/code/modules/mob/living/simple_animal/friendly/bumbles.dm
index 6ed6d03b68..7b7c10c007 100644
--- a/code/modules/mob/living/simple_animal/friendly/bumbles.dm
+++ b/code/modules/mob/living/simple_animal/friendly/bumbles.dm
@@ -29,7 +29,6 @@
verb_yell = "buzzes intensely"
emote_see = list("buzzes.", "makes a loud buzz.", "rolls several times.", "buzzes happily.")
speak_chance = 1
- unique_name = TRUE
/mob/living/simple_animal/pet/bumbles/Initialize()
. = ..()
From f1ef779e583ff00d86f5fde3012d0681c029cdb8 Mon Sep 17 00:00:00 2001
From: Blue Wildrose
Date: Thu, 1 Apr 2021 16:53:47 -0700
Subject: [PATCH 06/11] Bumbles no longer has a number beside their name
---
code/modules/mob/living/simple_animal/friendly/bumbles.dm | 1 +
1 file changed, 1 insertion(+)
diff --git a/code/modules/mob/living/simple_animal/friendly/bumbles.dm b/code/modules/mob/living/simple_animal/friendly/bumbles.dm
index 7b7c10c007..53be1434c9 100644
--- a/code/modules/mob/living/simple_animal/friendly/bumbles.dm
+++ b/code/modules/mob/living/simple_animal/friendly/bumbles.dm
@@ -29,6 +29,7 @@
verb_yell = "buzzes intensely"
emote_see = list("buzzes.", "makes a loud buzz.", "rolls several times.", "buzzes happily.")
speak_chance = 1
+ unique_name = FALSE
/mob/living/simple_animal/pet/bumbles/Initialize()
. = ..()
From bfdfa965851175fc081e387e240a7a95f4325f9e Mon Sep 17 00:00:00 2001
From: Changelogs
Date: Fri, 2 Apr 2021 00:12:57 +0000
Subject: [PATCH 07/11] Automatic changelog compile [ci skip]
---
html/changelog.html | 38 ++++------------------
html/changelogs/.all_changelog.yml | 3 ++
html/changelogs/AutoChangeLog-pr-14541.yml | 4 ---
3 files changed, 9 insertions(+), 36 deletions(-)
delete mode 100644 html/changelogs/AutoChangeLog-pr-14541.yml
diff --git a/html/changelog.html b/html/changelog.html
index f2c4a0822f..b095359174 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,6 +50,12 @@
-->
+
02 April 2021
+
LetterN updated:
+
+
29 March 2021
BlueWildrose updated:
@@ -893,38 +899,6 @@
- some more FUCKING hairs
- uncodersprites the advanced extinguisher
-
-
29 January 2021
-
MrJWhit updated:
-
- - Ported the QM, Captain, CMO, and HoS cloaks from beestation.
- - Removes excess air alarms from boxstation
-
-
TripleShades updated:
-
- - fixes engineering secure storage being the wrong area because I fucked that up previously my bad
- - removes funny extra light switch under right surgery table in surgery oops
- - Added chairs to the corpse launch viewing area
- - Small garden plot for flowers for parity with other station Chapels
- - Plain Bible to glass tables in Chapel
- - Candles and Matchbox to glass tables in Chapel
- - More glass tables, with a chaplain figure and another spare bible.
- - Bookcase to Box Chapel for parity with other station Chapels
- - Minimoog to Box Chapel as substitute for a church organ
- - Holy department sign just below Chapel change: Expanded the corpse launching area to feel less congested change: Added windows to the corpse launch so you can look inside I guess? change: Moved flowers and burial garments to the corner next to the corpse launcher change: Box Chaplain's office door is moved over one change: Confessional is now connected to Chaplain's office for parity with other station Chapels change: Moved coffins over to old confessional location change: Box Chapel now has pews instead of stools change: Box Chapel Confessional is now lit instead of being nearly pitch black remove: Two coffins from Chapel
-
-
timothyteakettle updated:
-
- - the miner bedsheet will now increment its progress when you redeem points from the ORM
- - you can add custom names and descriptions to item's on the loadout now
-
-
zeroisthebiggay updated:
-
- - roundstart aesthetic sterile masks and roundstart paper masks
- - more accessory slot items
- - cowbell necklace happy 2021
- - shibari ropes & torn pantyhose
-
GoonStation 13 Development Team
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index a5b0757748..2cdce1b29f 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -28938,3 +28938,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- rscadd: Added Smoke Grenade
silicons:
- bugfix: automated hydroponics system design now works properly
+2021-04-02:
+ LetterN:
+ - bugfix: piratepayment
diff --git a/html/changelogs/AutoChangeLog-pr-14541.yml b/html/changelogs/AutoChangeLog-pr-14541.yml
deleted file mode 100644
index 1f0a492311..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14541.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "LetterN"
-delete-after: True
-changes:
- - bugfix: "piratepayment"
From 87b20dc22e31e4267ecd0000e4e4571b6adce6db Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Fri, 2 Apr 2021 12:42:43 -0500
Subject: [PATCH 08/11] Automatic changelog generation for PR #14542 [ci skip]
---
html/changelogs/AutoChangeLog-pr-14542.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-14542.yml
diff --git a/html/changelogs/AutoChangeLog-pr-14542.yml b/html/changelogs/AutoChangeLog-pr-14542.yml
new file mode 100644
index 0000000000..1a6cc28d0e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-14542.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - rscadd: "Observe verb logging"
From 82b58ea5fe8b916097232a065be8fb3bd7378d02 Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Fri, 2 Apr 2021 12:44:25 -0500
Subject: [PATCH 09/11] Automatic changelog generation for PR #14558 [ci skip]
---
html/changelogs/AutoChangeLog-pr-14558.yml | 4 ++++
1 file changed, 4 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-14558.yml
diff --git a/html/changelogs/AutoChangeLog-pr-14558.yml b/html/changelogs/AutoChangeLog-pr-14558.yml
new file mode 100644
index 0000000000..f4497e2b5f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-14558.yml
@@ -0,0 +1,4 @@
+author: "BlueWildrose"
+delete-after: True
+changes:
+ - bugfix: "The hydroponics pet bee, Bumbles no longer has a number besides their name."
From e509f1956dfaf6dacc94d5adb7c47875e9c47ef6 Mon Sep 17 00:00:00 2001
From: Putnam3145
Date: Fri, 2 Apr 2021 10:48:55 -0700
Subject: [PATCH 10/11] Removed cloning destroy; removed commented-out objs
(#14539)
---
code/game/gamemodes/objective_sabotage.dm | 64 -----------------------
1 file changed, 64 deletions(-)
diff --git a/code/game/gamemodes/objective_sabotage.dm b/code/game/gamemodes/objective_sabotage.dm
index 1fbebfdac4..96772fd263 100644
--- a/code/game/gamemodes/objective_sabotage.dm
+++ b/code/game/gamemodes/objective_sabotage.dm
@@ -33,70 +33,6 @@
/datum/sabotage_objective/processing/check_conditions()
return won
-/*
-/datum/sabotage_objective/processing/power_sink
- name = "Drain at least 100 megajoules of power using a power sink."
- sabotage_type = "powersink"
- special_equipment = list(/obj/item/sbeacondrop/powersink)
- var/sink_found = FALSE
- var/count = 0
-
-/datum/sabotage_objective/processing/power_sink/check_condition_processing()
- for(var/s in GLOB.power_sinks)
- var/obj/item/powersink/sink = s
- won = max(won,sink.power_drained/1e8)
-*/
-
-/obj/item/paper/guides/antag/supermatter_sabotage
- info = "Ways to sabotage a supermatter:
\
- \
- - Set the air alarm's operating mode to anything that isn't 'draught' (yes, anything, though 'off' works best). Or just smash the air alarm, that works too.
\
- - Wrench a pipe (the junction to the cold loop is most effective, but some setups will robust through this no issue; best to try for multiple)
\
- - Pump in as much carbon dioxide, oxygen, plasma or tritium as you can find (this will likely also cause a singularity or tesla delamination, so watch out!)
\
- - Unset the filters on the cooling loop, or, perhaps more insidious, set them to oxygen/plasma.
\
- - Deactivate the digital valve that sends the exhaust gases to space (note: only works on box station; others you must unwrench).
\
- - There are many other ways; be creative!
\
-
"
-
-/*/datum/sabotage_objective/processing/supermatter
- name = "Sabotage the supermatter so that it goes under 50% integrity. If it is delaminated, you will fail."
- sabotage_type = "supermatter"
- special_equipment = list(/obj/item/paper/guides/antag/supermatter_sabotage)
- var/list/supermatters = list()
- excludefromjob = list("Chief Engineer", "Station Engineer", "Atmospheric Technician")
-
-/datum/sabotage_objective/processing/supermatter/check_condition_processing()
- if(!supermatters.len)
- supermatters = list()
- for(var/obj/machinery/power/supermatter_crystal/S in GLOB.machines)
- // Delaminating, not within coverage, not on a tile.
- if (!isturf(S.loc) || !(is_station_level(S.z) || is_mining_level(S.z)))
- continue
- supermatters.Add(S)
- for(var/obj/machinery/power/supermatter_crystal/S in supermatters) // you can win this with a wishgranter... lol.
- won = max(1-((S.get_integrity()-50)/50),won)
- return FALSE
-
-/datum/sabotage_objective/processing/supermatter/can_run()
- return (locate(/obj/machinery/power/supermatter_crystal) in GLOB.machines)
-
-/datum/sabotage_objective/station_integrity
- name = "Make sure the station is at less than 80% integrity by the end. Smash walls, windows etc. to reach this goal."
- sabotage_type = "integrity"
-
-/datum/sabotage_objective/station_integrity/check_conditions()
- return 5-(max(SSticker.station_integrity*4,320)/80)
-*/
-/datum/sabotage_objective/cloner
- name = "Destroy all Nanotrasen cloning machines."
- sabotage_type = "cloner"
-
-/datum/sabotage_objective/cloner/check_conditions()
- for(var/obj/machinery/clonepod/cloner in GLOB.machines)
- if(is_station_level(cloner.z))
- return FALSE
- return TRUE
-
/datum/sabotage_objective/ai_law
name = "Upload a hacked law to the AI."
sabotage_type = "ailaw"
From daba531fea5a1cb8999c32274e933d601b7442d6 Mon Sep 17 00:00:00 2001
From: CitadelStationBot
Date: Fri, 2 Apr 2021 12:48:58 -0500
Subject: [PATCH 11/11] Automatic changelog generation for PR #14539 [ci skip]
---
html/changelogs/AutoChangeLog-pr-14539.yml | 5 +++++
1 file changed, 5 insertions(+)
create mode 100644 html/changelogs/AutoChangeLog-pr-14539.yml
diff --git a/html/changelogs/AutoChangeLog-pr-14539.yml b/html/changelogs/AutoChangeLog-pr-14539.yml
new file mode 100644
index 0000000000..1b1a8fc5de
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-14539.yml
@@ -0,0 +1,5 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - rscdel: "\"Destroy all nanotrasen cloning machines\" objective is gone"
+ - code_imp: "Removed all the commented-out sabotage objectives (we can just get them from history)"