From 055704e5133e528b88d538e83de75631214d73c3 Mon Sep 17 00:00:00 2001 From: Mykhailo Bykhovtsev Date: Tue, 22 May 2018 11:15:35 -0700 Subject: [PATCH 01/12] Centcomm free veding machines (#4772) This Pull request makes all vending machines on ODIN have their items free. --- html/changelogs/Sindorman-dresser.yml | 6 ++++ maps/aurora/aurora-1_centcomm.dmm | 44 +++++++++++++++++++++------ 2 files changed, 41 insertions(+), 9 deletions(-) create mode 100644 html/changelogs/Sindorman-dresser.yml diff --git a/html/changelogs/Sindorman-dresser.yml b/html/changelogs/Sindorman-dresser.yml new file mode 100644 index 00000000000..9a277806af7 --- /dev/null +++ b/html/changelogs/Sindorman-dresser.yml @@ -0,0 +1,6 @@ +author: PoZe + +delete-after: True + +changes: + - maptweak: "Veding machines at Centcomm don't charge money for their products. Hail NanoTrasen!" diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 111e5360288..f2ec7ca9592 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -8133,13 +8133,20 @@ }, /area/centcom/living) "atb" = ( -/obj/machinery/vending/snack, +/obj/machinery/vending/snack{ + name = "Free Chocolate Corp"; + prices = list() + }, /turf/unsimulated/floor{ icon_state = "floor" }, /area/centcom/living) "atc" = ( /obj/machinery/vending/cola, +/obj/machinery/vending/cola{ + name = "Free Robust Softdrinks"; + prices = list() + }, /turf/unsimulated/floor{ icon_state = "floor" }, @@ -12573,7 +12580,7 @@ /area/centcom/specops) "aBL" = ( /obj/machinery/vending/snack{ - name = "hacked Getmore Chocolate Corp"; + name = "Free Chocolate Corp"; prices = list() }, /turf/unsimulated/floor{ @@ -12672,7 +12679,7 @@ /area/centcom/specops) "aBY" = ( /obj/machinery/vending/cola{ - name = "Robust Softdrinks"; + name = "Free Robust Softdrinks"; prices = list() }, /turf/unsimulated/floor{ @@ -12739,7 +12746,7 @@ /area/shuttle/specops/centcom) "aCh" = ( /obj/machinery/vending/cigarette{ - name = "cigarette machine"; + name = "Free Cigarette Machine"; prices = list() }, /turf/unsimulated/floor{ @@ -15939,7 +15946,10 @@ }, /area/centcom/holding) "aJv" = ( -/obj/machinery/vending/coffee, +/obj/machinery/vending/coffee{ + name = "Free Hot Drinks machine"; + prices = list() + }, /turf/unsimulated/floor{ icon_state = "green"; dir = 4 @@ -16190,7 +16200,10 @@ }, /area/centcom/holding) "aJW" = ( -/obj/machinery/vending/cigarette, +/obj/machinery/vending/cigarette{ + name = "Free Cigarette Machine"; + prices = list() + }, /turf/unsimulated/floor{ icon_state = "green"; dir = 4 @@ -18517,7 +18530,8 @@ icon_state = "floor" }, /obj/machinery/vending/snack{ - can_move = 0 + name = "Free Chocolate Corp"; + prices = list() }, /turf/unsimulated/floor{ icon_state = "wood_siding4" @@ -18614,7 +18628,8 @@ icon_state = "floor" }, /obj/machinery/vending/cola{ - can_move = 0 + name = "Free Robust Softdrinks"; + prices = list() }, /turf/unsimulated/floor{ icon_state = "wood_siding8" @@ -20553,6 +20568,10 @@ /area/tdome) "aTh" = ( /obj/machinery/vending/cigarette, +/obj/machinery/vending/cigarette{ + name = "Free Cigarette Machine"; + prices = list() + }, /turf/unsimulated/floor{ icon_state = "redbluefull"; dir = 8 @@ -20592,6 +20611,10 @@ /area/tdome/tdomeobserve) "aTm" = ( /obj/machinery/vending/coffee, +/obj/machinery/vending/coffee{ + name = "Free Hot Drinks machine"; + prices = list() + }, /turf/unsimulated/floor{ icon_state = "redbluefull"; dir = 8 @@ -20678,7 +20701,10 @@ }, /area/tdome/tdomeobserve) "aTx" = ( -/obj/machinery/vending/snack, +/obj/machinery/vending/snack{ + name = "Free Chocolate Corp"; + prices = list() + }, /turf/unsimulated/floor{ icon_state = "redbluefull"; dir = 8 From a184d830fc4fc60224839428abbdc4fa27685f54 Mon Sep 17 00:00:00 2001 From: LordFowl Date: Tue, 22 May 2018 17:15:30 -0400 Subject: [PATCH 02/12] Fixes rogue 3 broadcast (#4789) --- code/game/machinery/OpTable.dm | 2 +- html/changelogs/fixessurgerytable.yml | 37 +++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/fixessurgerytable.yml diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index 1534f1827b6..096fa59262f 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -82,7 +82,7 @@ if (C == user) user.visible_message("[user] climbs on \the [src].","You climb on \the [src].") else - visible_message("\The [C] has been laid on \the [src] by [user].", 3) + visible_message("\The [C] has been laid on \the [src] by [user].") if (C.client) C.client.perspective = EYE_PERSPECTIVE C.client.eye = src diff --git a/html/changelogs/fixessurgerytable.yml b/html/changelogs/fixessurgerytable.yml new file mode 100644 index 00000000000..2431be5a616 --- /dev/null +++ b/html/changelogs/fixessurgerytable.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: LordFowl + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes the number 3 being broadcasted from surgery tables." From 4f5570f058603f548d0a11bbc2983e08396bf3a1 Mon Sep 17 00:00:00 2001 From: Werner Date: Thu, 24 May 2018 19:58:13 +0200 Subject: [PATCH 03/12] Removes the Brainwashing manual (#4786) Syndites and Hextransenil have never been added, therefore the brainwashing manual has been removed --- code/game/objects/items/weapons/manuals.dm | 33 +--------------------- maps/aurora/aurora-4_mainlevel.dmm | 2 -- 2 files changed, 1 insertion(+), 34 deletions(-) diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 3440c0dd1f0..cfdd0ea3eaa 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -1367,35 +1367,4 @@ Remember; once you have been afflicted with brain trauma you are over four times as likely to suffer it again! Keep your patient's best interests at heart. - "} - -/obj/item/weapon/book/manual/brainwashing - name = "Disloyal to Loyal: The Legality of Brainwashing" - icon_state ="rulebook" - author = "Dr. Fredrick Richards" - title = "Disloyal to Loyal: The Legality of Brainwashing" - dat = {" - - - - -

Disloyal to Loyal: The Legality of Brainwashing

-

by Doctor Fredrick Richards with help from the NanoTrasen Legal Department

- - While it may be tempting as a Captain, Head of Security, or sometimes an officer to go around distributing anti-psychotics to maintain the peace, there are a few Corporate regulations and rules that must be kept in mind before even considering obtaining the medication.

- -

Pre-injection

- Generally, anti-psychotic medications should only be given out to criminals who have been charged with crimes that typically have Hold until Transfer, Cyborgification, and Loyalty Implant sentences, however some exceptions may apply. It is important to note that when using medicine to rehabilitate a criminal, the criminal in question is now legally considered a medical patient. In Tau Ceti space, it is illegal to prescribe, consume, or force a patient to consume anti-psychotic medication as a non-medical professional. As such, a non-medical personnel who injects or feeds prisoners with anti-psychotics may be charged with Suspicious Conduct, Excessive Use of Force In Detainment, Mistreatment of Prisoners, Neglect of Duty, Assault, Exceeding Official Powers, Mistreatment of Prisoners, and/or Gross Negligence. A trained and licensed medical professional are legally required to perform an evaluation first, and must be the one to perform the injection.

- -

Post-injection

- It is your duty as a member of the security department to oversee the health and well-being of prisoners and parolees. Those who have been giving anti-psychotic medication must be carefully monitored for their behaviour. Prisoners who skip doses, or overdose, are a threat to themselves and the people near them. If in the case of an overdose occurs, or a dose is missed, medical personnel should be contacted immediately and the situation dealt with appropriately. Failure to do so may result in Gross Negligence charges and potential demotion. - - - "} + "} \ No newline at end of file diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 51cf1840556..e1c55d09c1d 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -63487,7 +63487,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/book/manual/brainwashing, /turf/simulated/floor/carpet, /area/crew_quarters/captain) "cnT" = ( @@ -63529,7 +63528,6 @@ pixel_x = 5; pixel_y = -30 }, -/obj/item/weapon/book/manual/brainwashing, /turf/simulated/floor/tiled/dark, /area/crew_quarters/heads/hos) "cnW" = ( From 088e13ca10aee000c946b7c016b9de792414db72 Mon Sep 17 00:00:00 2001 From: Werner Date: Thu, 24 May 2018 19:59:02 +0200 Subject: [PATCH 04/12] IPC can be converted to the cult again, but only serve as constructs (#4779) Due to the feedback the recent cult changes regarding IPCs have been adapted so they can be converted again, but only serve as constructs. --- code/game/gamemodes/cult/runes.dm | 54 ++++++++++++++++++++++----- html/changelogs/arrow768-cultipcs.yml | 37 ++++++++++++++++++ 2 files changed, 81 insertions(+), 10 deletions(-) create mode 100644 html/changelogs/arrow768-cultipcs.yml diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 69261101f69..996c4659cda 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -133,11 +133,6 @@ var/list/sacrificed = list() target.hallucination = min(target.hallucination, 500) return 0 - //If you dont have blood, blood magic doesnt work on you - if(target.is_mechanical()) - attacker << "You sense that your powers can not effect them." - return 0 - target.take_overall_damage(0, rand(5, 20)) // You dirty resister cannot handle the damage to your mind. Easily. - even cultists who accept right away should experience some effects // Resist messages go! if(initial_message) //don't do this stuff right away, only if they resist or hesitate. @@ -181,11 +176,51 @@ var/list/sacrificed = list() var/choice = alert(target,"Do you want to join the cult?","Submit to Nar'Sie","Resist","Submit") waiting_for_input[target] = 0 if(choice == "Submit") //choosing 'Resist' does nothing of course. - cult.add_antagonist(target.mind) - converting -= target - target.hallucination = 0 //sudden clarity - playsound(target, 'sound/effects/bloodcult.ogg', 100, 1) + if(!target.is_mechanical()) + cult.add_antagonist(target.mind) + converting -= target + target.hallucination = 0 //sudden clarity + playsound(target, 'sound/effects/bloodcult.ogg', 100, 1) + else + converting -= target + //If we are dealing with a IPC then ask the caster what construct they want + var/construct_class = alert(attacker, "Please choose which type of construct you wish to create.",,"Juggernaut","Wraith","Artificer") + playsound(target, 'sound/effects/bloodcult.ogg', 100, 1) + + //Spawn some remains + new target.species.remains_type(target.loc) //spawns a skeleton based on the species remain type + target.invisibility = 101 + var/atom/movable/overlay/animation = new /atom/movable/overlay( target.loc ) + animation.icon_state = "blank" + animation.icon = 'icons/mob/mob.dmi' + animation.master = target + flick("dust-h", animation) + qdel(animation) + + //Spawn the selected construct + switch(construct_class) + if("Juggernaut") + var/mob/living/simple_animal/construct/armoured/Z = new /mob/living/simple_animal/construct/armoured (get_turf(target.loc)) + Z.key = target.key + qdel(target) + cult.add_antagonist(Z.mind) + Z << "You are playing a Juggernaut. Though slow, you can withstand extreme punishment, and rip apart enemies and walls alike." + Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." + if("Wraith") + var/mob/living/simple_animal/construct/wraith/Z = new /mob/living/simple_animal/construct/wraith (get_turf(target.loc)) + Z.key = target.key + qdel(target) + cult.add_antagonist(Z.mind) + Z << "You are playing a Wraith. Though relatively fragile, you are fast, deadly, and even able to phase through walls." + Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." + if("Artificer") + var/mob/living/simple_animal/construct/builder/Z = new /mob/living/simple_animal/construct/builder (get_turf(target.loc)) + Z.key = target.key + qdel(target) + cult.add_antagonist(Z.mind) + Z << "You are playing an Artificer. You are incredibly weak and fragile, but you are able to construct fortifications, repair allied constructs (by clicking on them), and even create new constructs" + Z << "You are still bound to serve your creator, follow their orders and help them complete their goals at all costs." sleep(100) //proc once every 10 seconds return 1 @@ -1064,7 +1099,6 @@ var/list/sacrificed = list() /////////////////////////////////////////TWENTY-FIFTH RUNE /obj/effect/rune/proc/armor(var/mob/living/user) - if(istype(src,/obj/effect/rune)) user.say("N'ath reth sh'yro eth d[pick("'","`")]raggathnor!") else diff --git a/html/changelogs/arrow768-cultipcs.yml b/html/changelogs/arrow768-cultipcs.yml new file mode 100644 index 00000000000..5a7f68be40b --- /dev/null +++ b/html/changelogs/arrow768-cultipcs.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: Arrow768 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "IPCs can be converted to the cult again, but only serve as constructs." From aab67e5e2ee766a102a3b065ea28a4559776e4cb Mon Sep 17 00:00:00 2001 From: Werner Date: Thu, 24 May 2018 19:59:35 +0200 Subject: [PATCH 05/12] News Loader Changes (#4788) Some changes to the news loader to prep for player news. --- SQL/migrate/V028__newscaster_player_news.sql | 13 +++++++++++++ code/controllers/subsystems/news.dm | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 SQL/migrate/V028__newscaster_player_news.sql diff --git a/SQL/migrate/V028__newscaster_player_news.sql b/SQL/migrate/V028__newscaster_player_news.sql new file mode 100644 index 00000000000..4576f388b01 --- /dev/null +++ b/SQL/migrate/V028__newscaster_player_news.sql @@ -0,0 +1,13 @@ +-- +-- Serverside changes to allow News published by players +-- +ALTER TABLE `ss13_news_stories` + CHANGE COLUMN `time_stamp` `publish_at` DATETIME NULL DEFAULT NULL AFTER `is_admin_message`, + ADD COLUMN `publish_until` DATETIME NULL DEFAULT NULL AFTER `publish_at`, + ADD COLUMN `ic_timestamp` DATETIME NULL DEFAULT NULL AFTER `publish_until`, + ADD COLUMN `approved_by` VARCHAR(50) NULL DEFAULT NULL AFTER `created_at`, + ADD COLUMN `approved_at` DATETIME NULL DEFAULT NULL AFTER `approved_by`, + ADD COLUMN `url` VARCHAR(250) NULL DEFAULT NULL AFTER `publish_until`; + +ALTER TABLE `ss13_news_channels` + CHANGE COLUMN `announcement` `announcement` VARCHAR(200) NULL DEFAULT NULL COLLATE 'utf8_bin' AFTER `is_admin_channel`; \ No newline at end of file diff --git a/code/controllers/subsystems/news.dm b/code/controllers/subsystems/news.dm index 619ac15ca58..ca081bd1134 100644 --- a/code/controllers/subsystems/news.dm +++ b/code/controllers/subsystems/news.dm @@ -40,7 +40,7 @@ catch(var/exception/ec) log_debug("SSnews: Error when loading channel: [ec]") continue - var/DBQuery/news_query = dbcon.NewQuery("SELECT body, author, is_admin_message, message_type, time_stamp FROM ss13_news_stories WHERE deleted_at IS NULL AND channel_id = :channel_id: ORDER BY created_at DESC") + var/DBQuery/news_query = dbcon.NewQuery("SELECT body, author, is_admin_message, message_type, ic_timestamp, url FROM ss13_news_stories WHERE deleted_at IS NULL AND channel_id = :channel_id: AND publish_at < NOW() AND (publish_until > NOW() OR publish_until IS NULL) AND approved_at IS NOT NULL ORDER BY publish_at DESC") news_query.Execute(list("channel_id" = channel_query.item[1])) while(news_query.NextRow()) CHECK_TICK From 0e8432a40e0c9e227cadfd249473afd4f5e6e146 Mon Sep 17 00:00:00 2001 From: skull132 Date: Fri, 25 May 2018 23:53:47 +0300 Subject: [PATCH 06/12] Changelogs, 25MAY2018 --- html/changelog.html | 14 ++++++++++ html/changelogs/.all_changelog.yml | 8 ++++++ html/changelogs/Sindorman-dresser.yml | 6 ----- html/changelogs/arrow768-cultipcs.yml | 37 --------------------------- html/changelogs/fixessurgerytable.yml | 37 --------------------------- 5 files changed, 22 insertions(+), 80 deletions(-) delete mode 100644 html/changelogs/Sindorman-dresser.yml delete mode 100644 html/changelogs/arrow768-cultipcs.yml delete mode 100644 html/changelogs/fixessurgerytable.yml diff --git a/html/changelog.html b/html/changelog.html index e83926967e8..604cc09b212 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,20 @@ -->
+

25 May 2018

+

Arrow768 updated:

+
    +
  • IPCs can be converted to the cult again, but only serve as constructs.
    • +
+

LordFowl updated:

+
    +
  • Fixes the number 3 being broadcasted from surgery tables.
    • +
+

PoZe updated:

+
    +
  • Veding machines at Centcomm don't charge money for their products. Hail NanoTrasen!
    • +
+

22 May 2018

Arrow768 updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 1795ef7b90a..9ba0fb2168c 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -5508,3 +5508,11 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. used items using the vending machines. Lohikar: - bugfix: Unathi can no longer chew on holograms. +2018-05-25: + Arrow768: + - rscadd: IPCs can be converted to the cult again, but only serve as constructs. + LordFowl: + - bugfix: Fixes the number 3 being broadcasted from surgery tables. + PoZe: + - maptweak: Veding machines at Centcomm don't charge money for their products. Hail + NanoTrasen! diff --git a/html/changelogs/Sindorman-dresser.yml b/html/changelogs/Sindorman-dresser.yml deleted file mode 100644 index 9a277806af7..00000000000 --- a/html/changelogs/Sindorman-dresser.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: PoZe - -delete-after: True - -changes: - - maptweak: "Veding machines at Centcomm don't charge money for their products. Hail NanoTrasen!" diff --git a/html/changelogs/arrow768-cultipcs.yml b/html/changelogs/arrow768-cultipcs.yml deleted file mode 100644 index 5a7f68be40b..00000000000 --- a/html/changelogs/arrow768-cultipcs.yml +++ /dev/null @@ -1,37 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -# balance -################################# - -# Your name. -author: Arrow768 - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - rscadd: "IPCs can be converted to the cult again, but only serve as constructs." diff --git a/html/changelogs/fixessurgerytable.yml b/html/changelogs/fixessurgerytable.yml deleted file mode 100644 index 2431be5a616..00000000000 --- a/html/changelogs/fixessurgerytable.yml +++ /dev/null @@ -1,37 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -# balance -################################# - -# Your name. -author: LordFowl - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - bugfix: "Fixes the number 3 being broadcasted from surgery tables." From de149741290a1dec858c086ff0c9358a9939c1f0 Mon Sep 17 00:00:00 2001 From: Red_Wall Date: Sat, 26 May 2018 22:58:08 +0300 Subject: [PATCH 07/12] fixes #4807 (#4808) --- code/game/objects/items/weapons/storage/belt.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index 825709f6b51..576f555a25d 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -103,7 +103,8 @@ /obj/item/clothing/glasses/hud/health, /obj/item/weapon/crowbar, /obj/item/device/flashlight, - /obj/item/weapon/extinguisher/mini + /obj/item/weapon/extinguisher/mini, + /obj/item/weapon/reagent_containers/inhaler ) /obj/item/weapon/storage/belt/medical/emt From bcb9a12180b8251b14beddc89d40d86e51831b9d Mon Sep 17 00:00:00 2001 From: Kaedwuff Date: Sun, 27 May 2018 09:24:12 -0500 Subject: [PATCH 08/12] Service Headset Fixes (#4813) Fixes #4809 and also gives the chaplain back his service headset... which I'm not sure why it was ever removed? They were always part of service before. --- code/game/jobs/job/civilian_chaplain.dm | 1 + .../crates_lockers/closets/job_closets.dm | 2 +- .../crates_lockers/closets/wardrobe.dm | 1 + .../Kaedwuff - Service Headsets.yml | 38 +++++++++++++++++++ 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Kaedwuff - Service Headsets.yml diff --git a/code/game/jobs/job/civilian_chaplain.dm b/code/game/jobs/job/civilian_chaplain.dm index e9ba159c345..4427d8740d9 100644 --- a/code/game/jobs/job/civilian_chaplain.dm +++ b/code/game/jobs/job/civilian_chaplain.dm @@ -20,6 +20,7 @@ var/obj/item/weapon/storage/bible/B = new /obj/item/weapon/storage/bible(H) //BS12 EDIT H.equip_to_slot_or_del(B, slot_l_hand) + H.equip_to_slot_or_del(new /obj/item/device/radio/headset/headset_service(H), slot_l_ear) H.equip_to_slot_or_del(new /obj/item/clothing/under/rank/chaplain(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/device/pda/chaplain(H), slot_belt) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black(H), slot_shoes) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 2a7901cd98c..4473beda789 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -62,7 +62,7 @@ /obj/structure/closet/jcloset/fill() new /obj/item/clothing/under/rank/janitor(src) - new /obj/item/device/radio/headset/headset_eng(src) + new /obj/item/device/radio/headset/headset_service(src) new /obj/item/weapon/cartridge/janitor(src) new /obj/item/clothing/gloves/black(src) new /obj/item/clothing/head/soft/purple(src) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index f496d4c0b12..5870fe86cd6 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -90,6 +90,7 @@ new /obj/item/weapon/storage/fancy/candle_box(src) new /obj/item/weapon/storage/fancy/candle_box(src) new /obj/item/weapon/deck/tarot(src) + new /obj/item/device/radio/headset/headset_service(src) return diff --git a/html/changelogs/Kaedwuff - Service Headsets.yml b/html/changelogs/Kaedwuff - Service Headsets.yml new file mode 100644 index 00000000000..8c384249e82 --- /dev/null +++ b/html/changelogs/Kaedwuff - Service Headsets.yml @@ -0,0 +1,38 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: Kaedwuff + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "The janitor's closet now has service headsets in it again." + - tweak: "The chaplain now also gets a service headset again." From 29f11df54bb2b65f6d434aef717a661ecae5c50a Mon Sep 17 00:00:00 2001 From: skull132 Date: Mon, 28 May 2018 01:20:51 +0300 Subject: [PATCH 09/12] Changelogs, 27MAY2018 --- html/changelog.html | 7 ++++ html/changelogs/.all_changelog.yml | 4 ++ .../Kaedwuff - Service Headsets.yml | 38 ------------------- 3 files changed, 11 insertions(+), 38 deletions(-) delete mode 100644 html/changelogs/Kaedwuff - Service Headsets.yml diff --git a/html/changelog.html b/html/changelog.html index 604cc09b212..9b4ca60062c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,13 @@ -->
    +

    28 May 2018

    +

    Kaedwuff updated:

    +
      +
    • The janitor's closet now has service headsets in it again.
      • +
    • The chaplain now also gets a service headset again.
      • +
    +

    25 May 2018

    Arrow768 updated:

      diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 9ba0fb2168c..9ab366ce33f 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -5516,3 +5516,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. PoZe: - maptweak: Veding machines at Centcomm don't charge money for their products. Hail NanoTrasen! +2018-05-28: + Kaedwuff: + - bugfix: The janitor's closet now has service headsets in it again. + - tweak: The chaplain now also gets a service headset again. diff --git a/html/changelogs/Kaedwuff - Service Headsets.yml b/html/changelogs/Kaedwuff - Service Headsets.yml deleted file mode 100644 index 8c384249e82..00000000000 --- a/html/changelogs/Kaedwuff - Service Headsets.yml +++ /dev/null @@ -1,38 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -# balance -################################# - -# Your name. -author: Kaedwuff - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - bugfix: "The janitor's closet now has service headsets in it again." - - tweak: "The chaplain now also gets a service headset again." From 72b48c7a98e76cbd68f71a8c79bd5e28b546d7b1 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Mon, 28 May 2018 19:25:29 -0300 Subject: [PATCH 10/12] Security map fixes. (#4821) --- maps/aurora/aurora-4_mainlevel.dmm | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index e1c55d09c1d..1a2f700fa7f 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -11861,21 +11861,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/structure/table/rack, /obj/item/weapon/storage/box/firingpins, -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/structure/sign/nosmoking_2{ - pixel_y = 32 - }, -/obj/machinery/camera/network/security{ - c_tag = "Security - Armoury Entrance"; - network = list("Security","Armoury") - }, -/obj/structure/window/reinforced{ - dir = 4 - }, /obj/structure/table/rack, /turf/simulated/floor/tiled/dark, /area/security/armoury) @@ -63109,7 +63095,6 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/clothing/gloves/combat, /obj/item/weapon/handcuffs, /turf/simulated/floor/tiled/dark, /area/security/main) From 809526ce00d7b627845e7b9d07d5b015b480878d Mon Sep 17 00:00:00 2001 From: Kaedwuff Date: Mon, 28 May 2018 17:26:16 -0500 Subject: [PATCH 11/12] Duller syringes (#4818) Fixes #4811 Added a new 'noslice' variable that can be used to check if something that has the 'sharp' tag should be able to slice fruit. --- code/game/objects/objs.dm | 1 + code/modules/hydroponics/grown.dm | 2 +- .../reagents/reagent_containers/syringes.dm | 1 + html/changelogs/Kaedwuff - Needleslicing.yml | 37 +++++++++++++++++++ 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 html/changelogs/Kaedwuff - Needleslicing.yml diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 1781b4de59e..6a69602dbcb 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -13,6 +13,7 @@ var/damtype = "brute" var/force = 0 var/armor_penetration = 0 + var/noslice = 0 // To make it not able to slice things. var/being_shocked = 0 diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 6f997f66851..20c0974d364 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -185,7 +185,7 @@ pocell.charge = pocell.maxcharge qdel(src) return - else if(W.sharp) + else if(W.sharp && !W.noslice) if(seed.kitchen_tag == "pumpkin") // Ugggh these checks are awful. user.show_message("You carve a face into [src]!", 1) new /obj/item/clothing/head/pumpkinhead (user.loc) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 8e8a4d0f291..8e595221256 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -18,6 +18,7 @@ w_class = 1 slot_flags = SLOT_EARS sharp = 1 + noslice = 1 unacidable = 1 //glass var/mode = SYRINGE_DRAW var/image/filling //holds a reference to the current filling overlay diff --git a/html/changelogs/Kaedwuff - Needleslicing.yml b/html/changelogs/Kaedwuff - Needleslicing.yml new file mode 100644 index 00000000000..65103334950 --- /dev/null +++ b/html/changelogs/Kaedwuff - Needleslicing.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: Kaedwuff + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "You can no longer slice fruit (or anything else) with a syringe." From 125f7709666d5476bf74fea420cbddcdcd772a8d Mon Sep 17 00:00:00 2001 From: skull132 Date: Tue, 29 May 2018 01:29:50 +0300 Subject: [PATCH 12/12] Changelogs, 28MAY2018 --- html/changelog.html | 6 ++++ html/changelogs/.all_changelog.yml | 3 ++ html/changelogs/Kaedwuff - Needleslicing.yml | 37 -------------------- 3 files changed, 9 insertions(+), 37 deletions(-) delete mode 100644 html/changelogs/Kaedwuff - Needleslicing.yml diff --git a/html/changelog.html b/html/changelog.html index 9b4ca60062c..8c4868a4f59 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
      +

      29 May 2018

      +

      Kaedwuff updated:

      +
        +
      • You can no longer slice fruit (or anything else) with a syringe.
        • +
      +

      28 May 2018

      Kaedwuff updated:

        diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 9ab366ce33f..26008dbe624 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -5520,3 +5520,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Kaedwuff: - bugfix: The janitor's closet now has service headsets in it again. - tweak: The chaplain now also gets a service headset again. +2018-05-29: + Kaedwuff: + - bugfix: You can no longer slice fruit (or anything else) with a syringe. diff --git a/html/changelogs/Kaedwuff - Needleslicing.yml b/html/changelogs/Kaedwuff - Needleslicing.yml deleted file mode 100644 index 65103334950..00000000000 --- a/html/changelogs/Kaedwuff - Needleslicing.yml +++ /dev/null @@ -1,37 +0,0 @@ -################################ -# Example Changelog File -# -# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. -# -# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) -# When it is, any changes listed below will disappear. -# -# Valid Prefixes: -# bugfix -# wip (For works in progress) -# tweak -# soundadd -# sounddel -# rscadd (general adding of nice things) -# rscdel (general deleting of nice things) -# imageadd -# imagedel -# maptweak -# spellcheck (typo fixes) -# experiment -# balance -################################# - -# Your name. -author: Kaedwuff - -# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. -delete-after: True - -# Any changes you've made. See valid prefix list above. -# INDENT WITH TWO SPACES. NOT TABS. SPACES. -# SCREW THIS UP AND IT WON'T WORK. -# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. -# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: - - bugfix: "You can no longer slice fruit (or anything else) with a syringe."