From 8645a2954ff5aa64549c783e604a40b2cefbd11b Mon Sep 17 00:00:00 2001 From: Hatterhat Date: Sat, 22 Aug 2020 16:13:41 -0500 Subject: [PATCH 1/3] tackle hando --- code/game/objects/items/storage/toolbox.dm | 3 ++- code/modules/clothing/gloves/tacklers.dm | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/storage/toolbox.dm b/code/game/objects/items/storage/toolbox.dm index a6b34c59e3..73246276c2 100644 --- a/code/game/objects/items/storage/toolbox.dm +++ b/code/game/objects/items/storage/toolbox.dm @@ -281,6 +281,7 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons) /obj/item/clothing/suit/armor/vest/infiltrator, /obj/item/clothing/under/syndicate/bloodred, /obj/item/clothing/gloves/color/latex/nitrile/infiltrator, + /obj/item/clothing/gloves/tackler/combat/insulated/infiltrator, /obj/item/clothing/mask/infiltrator, /obj/item/clothing/shoes/combat/sneakboots, /obj/item/gun/ballistic/automatic/pistol, @@ -292,7 +293,7 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons) new /obj/item/clothing/head/helmet/infiltrator(src) new /obj/item/clothing/suit/armor/vest/infiltrator(src) new /obj/item/clothing/under/syndicate/bloodred(src) - new /obj/item/clothing/gloves/color/latex/nitrile/infiltrator(src) + new /obj/item/clothing/gloves/tackler/combat/insulated/infiltrator(src) new /obj/item/clothing/mask/infiltrator(src) new /obj/item/clothing/shoes/combat/sneakboots(src) diff --git a/code/modules/clothing/gloves/tacklers.dm b/code/modules/clothing/gloves/tacklers.dm index 11b2afa968..f4b4140a1a 100644 --- a/code/modules/clothing/gloves/tacklers.dm +++ b/code/modules/clothing/gloves/tacklers.dm @@ -72,6 +72,25 @@ siemens_coefficient = 0 permeability_coefficient = 0.05 +/obj/item/clothing/gloves/tackler/combat/insulated/infiltrator + name = "insidious guerrilla gloves" + desc = "Specialized combat gloves for carrying people around. Transfers tactical kidnapping and tackling knowledge to the user via the use of nanochips." + icon_state = "infiltrator" + item_state = "infiltrator" + siemens_coefficient = 0 + permeability_coefficient = 0.05 + resistance_flags = FIRE_PROOF | ACID_PROOF + var/carrytrait = TRAIT_QUICKER_CARRY + +/obj/item/clothing/gloves/tackler/combat/insulated/infiltrator/equipped(mob/user, slot) + . = ..() + if(slot == SLOT_GLOVES) + ADD_TRAIT(user, carrytrait, GLOVE_TRAIT) + +/obj/item/clothing/gloves/tackler/combat/insulated/infiltrator/dropped(mob/user) + . = ..() + REMOVE_TRAIT(user, carrytrait, GLOVE_TRAIT) + /obj/item/clothing/gloves/tackler/rocket name = "rocket gloves" desc = "The ultimate in high risk, high reward, perfect for when you need to stop a criminal from fifty feet away or die trying. Banned in most Spinward gridiron football and rugby leagues." From a9142ab64aacf95353cc697e049318d7d68d7ab3 Mon Sep 17 00:00:00 2001 From: Changelogs Date: Mon, 24 Aug 2020 00:15:48 +0000 Subject: [PATCH 2/3] Automatic changelog compile [ci skip] --- html/changelog.html | 39 +++++++++++----------- html/changelogs/.all_changelog.yml | 12 +++++++ html/changelogs/AutoChangeLog-pr-13182.yml | 4 --- html/changelogs/AutoChangeLog-pr-13204.yml | 4 --- html/changelogs/AutoChangeLog-pr-13209.yml | 5 --- html/changelogs/AutoChangeLog-pr-13239.yml | 4 --- html/changelogs/AutoChangeLog-pr-13243.yml | 4 --- 7 files changed, 32 insertions(+), 40 deletions(-) delete mode 100644 html/changelogs/AutoChangeLog-pr-13182.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13204.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13209.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13239.yml delete mode 100644 html/changelogs/AutoChangeLog-pr-13243.yml diff --git a/html/changelog.html b/html/changelog.html index fd590f4673..d2f9fd9a86 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -50,6 +50,26 @@ -->
+

24 August 2020

+

MrJWhit updated:

+
    +
  • Fixes areas on expanded airlocks
    • +
+

silicons updated:

+
    +
  • wormhole jaunters work
    • +
  • wormhole jaunters no longer get interference from bags of holding
    • +
  • airlocks now only shock on pulse/wirecutters instead of on tgui panel open.
    • +
+

timothyteakettle updated:

+
    +
  • three new items are in the loadout for all donators
    • +
+

zeroisthebiggay updated:

+
    +
  • contraband black evening gloves in kinkvend
    • +
+

23 August 2020

DeltaFire15 updated:

    @@ -1449,25 +1469,6 @@
  • bonfires/grills no longer produce infinite quantities of food
  • slime's alter form ability now updates their hair colour when changing their body colour
- -

22 June 2020

-

Ghommie (porting PRs by zxaber, Ryll-Ryll, AnturK) updated:

-
    -
  • Certain small items purchased through cargo now get grouped into a single box. They also are immune to the 10% private account fee.
    • -
  • Added single-order options for several existing products in the Cargo Catalog.
    • -
  • Medkit listings are now single-pack items, and considered small items that get grouped into single boxes. Price for medkits is as close to unchanged as is reasonable.
    • -
  • You can now beat on vending machines to try and knock loose free stuff! You can also almost kill yourself doing it, so it's your call if your life is worth ten bucks.
    • -
  • Cigarette packets now have coupons on the back for small cargo items! Smoking DOES pay!
    • -
  • Some single/small items in cargo have been rebranded as goodies, come in lockboxes rather than crates, and can only be purchased with private accounts.
    • -
-

kevinz000 updated:

-
    -
  • Life() is split into BiologicalLife() and PhysicalLife. A component signal has been added that can prevent either from ticking.
    • -
-

shellspeed1 updated:

-
    -
  • Adds IV bags.
    • -
GoonStation 13 Development Team diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index d4243a01ec..88aef958e8 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -27060,3 +27060,15 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - rscadd: suiciding with the temporal katana omae wa mou shinderius you into the shadow realm - soundadd: twilight isnt earrape +2020-08-24: + MrJWhit: + - bugfix: Fixes areas on expanded airlocks + silicons: + - bugfix: wormhole jaunters work + - tweak: wormhole jaunters no longer get interference from bags of holding + - bugfix: airlocks now only shock on pulse/wirecutters instead of on tgui panel + open. + timothyteakettle: + - rscadd: three new items are in the loadout for all donators + zeroisthebiggay: + - rscadd: contraband black evening gloves in kinkvend diff --git a/html/changelogs/AutoChangeLog-pr-13182.yml b/html/changelogs/AutoChangeLog-pr-13182.yml deleted file mode 100644 index 9beb8f28c5..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13182.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "silicons" -delete-after: True -changes: - - bugfix: "airlocks now only shock on pulse/wirecutters instead of on tgui panel open." diff --git a/html/changelogs/AutoChangeLog-pr-13204.yml b/html/changelogs/AutoChangeLog-pr-13204.yml deleted file mode 100644 index e9033c299d..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13204.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "timothyteakettle" -delete-after: True -changes: - - rscadd: "three new items are in the loadout for all donators" diff --git a/html/changelogs/AutoChangeLog-pr-13209.yml b/html/changelogs/AutoChangeLog-pr-13209.yml deleted file mode 100644 index f885a4dc93..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13209.yml +++ /dev/null @@ -1,5 +0,0 @@ -author: "silicons" -delete-after: True -changes: - - bugfix: "wormhole jaunters work" - - tweak: "wormhole jaunters no longer get interference from bags of holding" diff --git a/html/changelogs/AutoChangeLog-pr-13239.yml b/html/changelogs/AutoChangeLog-pr-13239.yml deleted file mode 100644 index 0f01f680c6..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13239.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "zeroisthebiggay" -delete-after: True -changes: - - rscadd: "contraband black evening gloves in kinkvend" diff --git a/html/changelogs/AutoChangeLog-pr-13243.yml b/html/changelogs/AutoChangeLog-pr-13243.yml deleted file mode 100644 index a09ae5d607..0000000000 --- a/html/changelogs/AutoChangeLog-pr-13243.yml +++ /dev/null @@ -1,4 +0,0 @@ -author: "MrJWhit" -delete-after: True -changes: - - bugfix: "Fixes areas on expanded airlocks" From c14b01b49fcea61b7e51b407294b8eeef19e5f8a Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sun, 23 Aug 2020 19:36:06 -0500 Subject: [PATCH 3/3] Automatic changelog generation for PR #13238 [ci skip] --- html/changelogs/AutoChangeLog-pr-13238.yml | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 html/changelogs/AutoChangeLog-pr-13238.yml diff --git a/html/changelogs/AutoChangeLog-pr-13238.yml b/html/changelogs/AutoChangeLog-pr-13238.yml new file mode 100644 index 0000000000..8e3d2c148b --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-13238.yml @@ -0,0 +1,4 @@ +author: "Hatterhat" +delete-after: True +changes: + - rscadd: "Insidious combat gloves have been replaced by insidious guerilla gloves. They're generally the same, except now you can tackle with them."