Gamma ERT Changes #9631

Birdtalon · 2018-09-28T18:12:39Z

This PR introduces some sweeping changes to the Gamma ERT, as well as a couple of new features for ERT in general.

Ideas and balance decisions: LPSpartan (@Spartan6)
Contributed sprites: Shazbot. (@shazbot194)
Memager (ERT suits before tweaks from Shazbot)

Backend Changes:

ERT files moved to their own directory. Outfit datums moved to their own file.

Alters /turf/simulated/wall/proc/thermitemelt() to allow for a time to be passed to it.
Allows bodyanalyzer to be charged in rechargers.
Some variables changed to TRUE, FALSE.
Fixes some missing spans and spelling errors in ert.dm (formerly response_team.dm)

Features

Multi Lens Immolator Cannon

Has two firing modes. "Precise" and "scatter". Precise deals 45 damage and ignites the target. Scatter fires 6 projectiles which deal 8 damage per projectile and ignites.

Portable Body Analyzer

Holds the same functionality of the body scanner machine, however requires a 10 second scan of of a mob. It then prints the same print out. Comes in an advanced and standard version which vary in cell capacity,

T4 Thermite charge

Wall breaching charge similar to X4. Thermites through adjacent walls at high speed, followed by a small explosion and smoke on the other side of the wall on which it was placed.

Minor

PDW-9

Reskin of the blueshield gun to use as an ERT sidearm. Functionally identical to the blueshield's advanced stun gun.

Adds a fireproof variant of the ERT armour for gamma ERT. New sprites for these suits are below.

Amber Paranormal ERT armour with the crusader armour sprites.

Loadout changes:

Removed all pulse weapons.
Introduces PDW-9 as a side arm for red commander, gamma commander, red security, gamma engineer, gamma medic.
Introduces various implants to red and gamma ERT.
Removes sec huds from gamma ERT in exchange for implants + regular sunglasses.
Gamma ERT medic and engineers get implants related to their roles.
Gamma ERT security get multi lens immolator gun.
Red and Gamma ERT get portable body analyzers.
Security belt for Gamma ERT slightly changed.
Amber paranormal ERT gets a space suit with crusader armour sprites.
Gamma ERT get fireproof variants of their space suits.
ERT no longer get the standard Box and instead get a survival box only.
Salycilic acid pill removed from survival box in favour of autoinjector.

This started a while ago so I may have missed some things in this description. I will be going over this again at the weekend to double check my changes. However please point out any errors/missing parts.

If anyone wants to mess around with these changes and can't/don't want to compile then @ me on discord @Birdtalon #9841 and I can add your ckey to my server with admin rights and you can play around.

--
Authorised by Tigercat and Crazylemon
Merged feature Freeze fixes:
#9593, #9591, #9597

🆑 Birdtalon , LPSpartan, Shazbot, Memager
add: Portable Body Analyzer for ERT
add: Muilti Lens Immolation gun for gamma ERT
add: PDW-9 sidearm for ERT
add: T4 Thermite Charge for Gamma ERT security
add: Sprites for gamma ERT suits
tweak: Red ERT loadouts
tweak: Gamma ERT loadouts
/🆑

adds more code for ERT scanner ert scanner

corrections to update_icon updating icons, charging the analyser, power consumption tweaks

…parameter

# Conflicts: # code/modules/response_team/ert_outfits.dm

…sprite, adds paranormal armour variants.

Birdtalon · 2018-09-28T18:24:32Z

code/modules/response_team/ert.dm

+	pda = /obj/item/pda/heads/ert
+	id = /obj/item/card/id/ert
+	l_ear = /obj/item/radio/headset/ert/alt
+	box = /obj/item/storage/box/responseteam


This was changed from regular box.

Birdtalon · 2018-09-28T18:25:05Z

code/modules/response_team/ert.dm

+/obj/item/storage/box/responseteam/
+	name = "boxed survival kit"
+
+/obj/item/storage/box/responseteam/New()


Equipment provided in this box was changed. Salicylic acid pill removed. Autoinjector added.

Spartan6 · 2018-09-28T18:31:22Z

code/modules/surgery/organs/augments_arms.dm

+
+/obj/item/organ/internal/cyberimp/arm/advmop
+	name = "advanced mob implant"


advanced mob implant

Taaketa · 2018-09-29T05:40:58Z

Does this mean the ERTs lose the laser rifle?

th6795 · 2018-09-29T06:36:02Z

@Taaketa

Red ERT lose the accelerator cannon and Gamma ERT lose the pulse rifle.

These are both good changes though, in my opinion because the accelerator cannon was trash anyways as it did not fit into any slots or bags and the damage was dependent on how far you were from the target which is pretty situational in my opinion.

As far as Gamma, the pulse rifle was pretty OP for that level. It caused there to be a huge gap in firepower between Red and Gamma which in-turn made it more difficult to justify a higher level ERT if something more than Red was needed.

SkeletalElite · 2018-09-29T07:18:01Z

Red ERT has this as a secondary
Red also has that 3 round burst laser rifle thats reloaded with magazines

Spartan6 · 2018-09-29T07:25:43Z

That laser carbine for Red has been a thing for ERT for over a month, this PR is not adding it.

SamHPurp · 2018-09-29T14:46:26Z

code/game/objects/items/devices/scanners.dm

+		return
+
+	if(!ready)
+		to_chat(user, "<span class='notice'>The scanner beeps angrily at you! It's currently recharging - [round((time_to_use - world.time) * 0.1)] seconds remaining.")


close your span

SamHPurp · 2018-09-29T14:47:05Z

code/game/objects/items/devices/scanners.dm

+	if(power_supply.charge >= usecharge)
+		mobScan(M, user)
+	else
+		to_chat(user, "<span class='notice'>The scanner beeps angrily at you! It's out of charge!")


close your span

SamHPurp · 2018-09-29T14:48:15Z

code/game/objects/items/devices/scanners.dm

+			printout.name = "Scan report - [M.name]"
+			playsound(user.loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1)
+			user.put_in_hands(printout)
+			time_to_use = world.time + 600


thanks darling <3

SamHPurp · 2018-09-29T14:50:15Z

code/game/objects/items/devices/scanners.dm

+			addtimer(CALLBACK(src, /obj/item/bodyanalyzer/.proc/update_icon), 20)
+
+	else if(iscorgi(M) && M.stat == DEAD)
+		to_chat(user, "<span class='notice'>You wonder if [M.p_they()] was a good dog. <b>[src] tells you they were the best...</b></span>") // :'(


SamHPurp · 2018-09-29T14:52:09Z

code/game/objects/items/devices/scanners.dm

+	var/found_disease = FALSE
+	for(var/thing in target.viruses)
+		var/datum/disease/D = thing
+		if(D.visibility_flags & HIDDEN_SCANNER || D.visibility_flags & HIDDEN_PANDEMIC)


Tiny thing, but maybe rework so you're not just checking the same var twice...

I mean, it's checking that two different bits are on. But I could just do if(D.visibility_flags) as there's only two to worry about and this already checks for both.

SkeletalElite · 2018-10-05T00:55:12Z

Considering the PDW-9 is a respite of the advanced stun revolver, can a seclite be attached to it and if so does that have a sprite

shazbot194 · 2018-10-05T01:17:49Z

They all use the same sprite, it’s more of a question if the new x y is set.

Birdtalon · 2018-10-07T17:51:06Z

Bugs addressed:

Gamma ERT sec belt inaccessable.
Suits now are named "elite"
Gamma ERT Medic gets both his arm implants
Commander gets his enforcer
Immolator gun now goes in suit storage slot

…deletion from backpack_contents list numerous bugfixes adds new suit sprites

Birdtalon · 2018-10-07T21:35:29Z

Added sprites for gamma ERT suits.

variableundefined · 2018-10-08T05:30:06Z

@Birdtalon Travis issue with enforcer lethal ammo typepath
code\modules\response_team\ert_outfits.dm:86:error: /obj/item/ammo_box/magazine/m45/enforcer45/lethal: undefined type path
code\modules\response_team\ert_outfits.dm:94:error: /obj/item/ammo_box/magazine/m45/enforcer45/lethal: undefined type path

Birdtalon · 2018-10-08T07:38:45Z

@variableundefined typepath was changed by #9401 - I will fix asap.

variableundefined

LGTM

variableundefined · 2018-10-09T00:28:13Z

code/game/machinery/recharger.dm

@@ -115,6 +115,13 @@
 				if(R.rcell.give(R.rcell.chargerate))
 					use_power(200)
 					using_power = 1
+
+		if(istype(charging, /obj/item/bodyanalyzer))


Cell component when

variableundefined · 2018-10-09T00:30:53Z

code/game/objects/items/devices/scanners.dm

@@ -632,3 +632,253 @@ REAGENT SCANNER
 	if(T.cores > 1)
 		user.show_message("Anomalous slime core amount detected", 1)
 	user.show_message("Growth progress: [T.amount_grown]/10", 1)
+
+/obj/item/bodyanalyzer
+	name = "handheld body analyzer"


😱 We really need to componentize this if this is going to be used again

variableundefined · 2018-10-09T00:58:06Z

Travis take so long..

IrkallaEpsilon · 2018-10-12T14:17:11Z

@Birdtalon I checked the Loadouts, the Gamma Paranormal ERT is missing a Nullrod.

Birdtalon · 2018-10-12T14:36:48Z

@IrkallaEpsilon 👍

Birdtalon added 13 commits August 29, 2018 18:57

adds multi lens immolation gun

49e47d0

further gun tweaks/changes, adds sprite

5275b5f

adds extra icon overlay

8ed6cd3

adds scanner icons

0a83572

adds more code for ERT scanner ert scanner

finishing touches to scanner

9eea8fa

corrections to update_icon updating icons, charging the analyser, power consumption tweaks

adds T4 thermite charge, alters thermitemelt() slightly to add speed …

5dff419

…parameter

adds ERT sidearm "PDW-9"

d6dc26c

adds telebaton implant

568d920

changes to ERT equipment datums, organises some files a little clearer

424f3ac

Merge branch 'master' into ERT-gun

d35155b

# Conflicts: # code/modules/response_team/ert_outfits.dm

further outfit datum changes, adds janitor advanced mop implant

d60d0f1

gamma fireproof suits, fixed an accidental removal in scanners.dm

eb312f5

tidying up

55fa8bb

tigercat2000 added Feature This PR is a new addition to the game Balance This PR will modify how effective something is or isnt labels Sep 28, 2018

adds paranormal loadouts, alters ERT survival kit box, updates PDW 9 …

deec799

…sprite, adds paranormal armour variants.

Birdtalon force-pushed the ERT-changes branch from bcc65ee to deec799 Compare September 28, 2018 18:23

Birdtalon commented Sep 28, 2018

View reviewed changes

Spartan6 reviewed Sep 28, 2018

View reviewed changes

fixes

af045a5

variableundefined added the UPDATE NEEDED label Sep 29, 2018

SamHPurp reviewed Sep 29, 2018

View reviewed changes

variableundefined removed the UPDATE NEEDED label Oct 1, 2018

adds sprite for T4

f877e6b

Birdtalon force-pushed the ERT-changes branch from 74164a6 to f877e6b Compare October 3, 2018 21:20

variableundefined added the Test Merge Candidate Something that should / will be test merged before merging. label Oct 7, 2018

bugfixes

4151487

Birdtalon added 2 commits October 7, 2018 19:22

Merge branch 'master' into ERT-changes

074ee96

changes equip_to_slot_or_del() to equip_or_collect() to prevent item …

f36b0a4

…deletion from backpack_contents list numerous bugfixes adds new suit sprites

Birdtalon force-pushed the ERT-changes branch from 3a42ad4 to f36b0a4 Compare October 7, 2018 21:33

Birdtalon closed this Oct 7, 2018

Birdtalon reopened this Oct 7, 2018

Birdtalon force-pushed the ERT-changes branch from 855a781 to 6033cf9 Compare October 8, 2018 08:22

fixes broken type-path and duplicated helmet sprites

90c2197

Birdtalon force-pushed the ERT-changes branch from 6033cf9 to 90c2197 Compare October 8, 2018 08:24

changes telebaton to classic

50e6721

variableundefined removed Needs Review Test Merge Candidate Something that should / will be test merged before merging. labels Oct 9, 2018

variableundefined approved these changes Oct 9, 2018

View reviewed changes

variableundefined merged commit c2bf480 into ParadiseSS13:master Oct 9, 2018

ParadiseSS13-Bot added a commit that referenced this pull request Oct 9, 2018

Automatic changelog generation for PR #9631 [ci skip]

9bd0e2a

Birdtalon deleted the ERT-changes branch October 9, 2018 17:17

Birdtalon mentioned this pull request Oct 12, 2018

Gives paranormal gamma a nullrod #9826

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Gamma ERT Changes #9631

Gamma ERT Changes #9631

Birdtalon commented Sep 28, 2018 •

edited

Birdtalon Sep 28, 2018

Birdtalon Sep 28, 2018

Spartan6 Sep 28, 2018

Birdtalon Sep 28, 2018

Taaketa commented Sep 29, 2018

th6795 commented Sep 29, 2018

SkeletalElite commented Sep 29, 2018

Spartan6 commented Sep 29, 2018

SamHPurp Sep 29, 2018

SamHPurp Sep 29, 2018

SamHPurp Sep 29, 2018

SamHPurp Sep 29, 2018

Spartan6 Sep 29, 2018

SamHPurp Sep 29, 2018

Birdtalon Sep 29, 2018 •

edited

SkeletalElite commented Oct 5, 2018

shazbot194 commented Oct 5, 2018

Birdtalon commented Oct 7, 2018

Birdtalon commented Oct 7, 2018

variableundefined commented Oct 8, 2018

Birdtalon commented Oct 8, 2018

variableundefined left a comment

variableundefined Oct 9, 2018

variableundefined Oct 9, 2018

variableundefined commented Oct 9, 2018

IrkallaEpsilon commented Oct 12, 2018

Birdtalon commented Oct 12, 2018


		/obj/item/organ/internal/cyberimp/arm/advmop
		name = "advanced mob implant"

Gamma ERT Changes #9631

Gamma ERT Changes #9631

Conversation

Birdtalon commented Sep 28, 2018 • edited

Backend Changes:

Features

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Taaketa commented Sep 29, 2018

th6795 commented Sep 29, 2018

SkeletalElite commented Sep 29, 2018

Spartan6 commented Sep 29, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Birdtalon Sep 29, 2018 • edited

Choose a reason for hiding this comment

SkeletalElite commented Oct 5, 2018

shazbot194 commented Oct 5, 2018

Birdtalon commented Oct 7, 2018

Birdtalon commented Oct 7, 2018

variableundefined commented Oct 8, 2018

Birdtalon commented Oct 8, 2018

variableundefined left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

variableundefined commented Oct 9, 2018

IrkallaEpsilon commented Oct 12, 2018

Birdtalon commented Oct 12, 2018

Birdtalon commented Sep 28, 2018 •

edited

Birdtalon Sep 29, 2018 •

edited