Commit Graph

63 Commits

Author SHA1 Message Date
E-MonaRhg
4ee75ce29d Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-27 16:37:58 +02:00
variableundefined
e788278f57 Merge pull request #16397 from Sirryan2002/ERTFix
Jani ERT Equipment Tweak
2021-07-26 20:37:03 -04:00
variableundefined
0b7e40d78c Merge pull request #16395 from Qwertytoforty/old-reliable
Better equips med ERT for the basics
2021-07-26 20:36:09 -04:00
Sirryan2002
850ce3f12c adds nv to jani gamma 2021-07-20 14:36:15 -04:00
Sirryan2002
6b6b9a68da Jani ERT Equipment Tweak 2021-07-19 16:28:31 -04:00
Qwertytoforty
f9d00d8df3 Better equips med ERT for the basics 2021-07-19 11:19:12 -04:00
E-MonaRhg
c303a2b3f2 Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-09 00:03:38 +02:00
AffectedArc07
c7fd6681a1 Gamemode configuration 2021-05-16 15:15:05 +01:00
ppi13
9a582679f1 Gives ERT Combat Gloves (#15879)
* Gives ERT Combat Gloves

* Removes pasta
2021-04-20 21:50:17 +01:00
E-MonaRhg
7b342f4476 Hey, that compact defib thing is pretty cool, what if we had three? 2021-03-31 22:34:17 +02:00
AffectedArc07
f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Fox McCloud
75935ff876 Converts Eye Augments to Cybernetic Eyes (#15519)
* Converts Eye Augments to Cybernetic Eyes

* literally not used

* it helps when you properly include all the code

* flashlight eyes

* tweaks

* conflict resolution

* can't have two eyes

* order of operations matters here

* autosurgeon
2021-03-03 20:21:30 +00:00
AffectedArc07
f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
Fox McCloud
003a1f7cba Tank Refactor; Breathing Retool (#15371)
* Tank Refactor Breathing Retool

* missed maps and doc

* just in case
2021-01-28 20:57:37 +00:00
Fox McCloud
de795c4e31 Radiation Refactor (#15331)
* First Commit

* visible radiation and engine goggles

* correction

* t-ray fix

* further adjustments and fixups

* gieger addition and cleaning fixup

* yet more fixes

* styling fixes

* fixes

* human glowing fix

* do the merge conflict avoidance dance

* Update supermatter.dm

* supermatter rads

* mapping in

* radiation doors

* yeah yeah line endings

* clean up

* styling issues

* showers
2021-01-24 22:03:13 +00:00
dearmochi
14e9e92508 Sets ERT's offstation_role to TRUE (#15282) 2021-01-20 09:59:54 +00:00
Darkmight9
c456b89952 Gives Red alert jani ERT improved jani arm implant, gives the mop implant to amber jani ERT (#14928) 2020-12-16 14:59:03 -05:00
Qwertytoforty
f125a501a4 Gives red and gamma (just gamma for janitor) death alarms (#15103) 2020-12-16 14:01:43 -05:00
Qwertytoforty
47176c0a14 Makes red ERT use the proper hardsuit (#15003) 2020-12-09 11:53:36 -05:00
AffectedArc07
54dd2765b4 Converts all tgui_ to ui_ 2020-11-21 12:10:58 +00:00
Kyep
f5a1a359a1 ERT Commander Rework (#14640)
* ERT Commander Rework

* instant = TRUE

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-10-21 09:44:37 -04:00
TDSSS
328b7fa8d8 ERT idiotproofing and minor tweaks (#13834)
* makes ert more robust

* renamed and tweaked

* idiot proofing of ert

* I cannot into git, oops

* removed the anti-stun from code red erts again

* removed implied src
2020-09-16 16:38:25 -04:00
AffectedArc07
2e29a1ddcb Merge remote-tracking branch 'ParadiseSS13/master' into pr/Kyep/14190 2020-09-15 20:46:10 +01:00
Kyep
28d915b26f fixes merge conflict 2020-09-15 08:40:03 -07:00
Kyep
0bf5d71ddf defaults 2020-08-29 21:05:50 -07:00
Kyep
e71f40f3c0 [TGUI] ERT Manager 2020-08-29 17:34:01 -07:00
Kyep
6927ad1b31 Port Radios to TGUI 2020-08-09 12:36:30 -07:00
mochi
977a022d40 Convert remaining pollCandidates, remove original proc 2020-07-10 11:07:11 +02:00
Kyep
547d76fb4b Cyborg Improvements (#13056)
* ash storm immunity

* safety override & lavaproof upgrades

* mini-extinguisher for janiborg

* borg cell paths, prevent station borgs using gamma module

* Limit crew SecBorgs to 2, DS borg laser reflection

* replaces standard module with generalist module

* generalist borg gets crowbar

* fix bug where ert engi/med borgs runtime / do not get sprites

* adds TG lavaland and spidermin mining cyborg icons

* roundstart borgs=2, spawn locations=4

* adds damage_protection mechanic

* add xeno_disarm_chance

* ERT borg naming scheme: (level) ERT (number)

* std borg: tweaks hypo, RMs holoproj, adds mats/subsystems

* AA bullet_arc refactor

* refactors var/require_module to be bool, proc/action() to return bool

Suggested by farie82

* better radio for generalist

* rework gamma borgs, split of destroyer borgs

* dead robots fix

* fixes error caused by merging of PR 12932

* manually fix line endings

* fixes borg energy weapons (except disablers) not being recharged within recharging stations

* add trailing newline to make travis pass

* compatibility with #13471 life refactor

* deletes change to gamma sec ERT laser beam energy cost

* refactor handling of ash/lava immunities

* removes spiderlike mining borg sprite

* tweaks generalist borg loadout

* limit secborgs to 1 on green alert / roundstart

* re-run icondiffbot

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-06-28 14:16:14 -06:00
AffectedArc07
928a8f0e04 Makes the code pass dreamchecker (#13161)
* Initial Commit - Trying to add DC to Travis

* Forgot to chmod

* This took too long

* Farie Fixes

* Fixes new code

* Job factions are fucking smelly

* Loadouts work again

* Runtime fixes
2020-04-11 15:59:16 -06:00
AffectedArc07
210f8badf4 Makes all global variables handled by the GLOB controller (#13152)
* Handlers converted, now to fix 3532 compile errors

* 3532 compile fixes later, got runtimes on startup

* Well the server loads now atleast

* Take 2

* Oops
2020-03-20 21:56:37 -06:00
Fox McCloud
eef0bc919d Implements Tailoring 2019-08-26 17:41:39 -04:00
Fox McCloud
cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
variableundefined
5daf9a190b Merge pull request #11712 from Markolie/lazy
Custom outfit manager and spawn with outfit on transform/reincarnate
2019-08-24 12:27:48 -04:00
tayyyyyyy
0f9feead4e Randomized ERT priority 2019-07-08 15:01:13 -07:00
tayyyyyyy
f0d9aaeb0a Increase role ranking time to 20 seconds 2019-07-08 15:00:29 -07:00
Mark van Alphen
8234881a2a New custom outfit managers, select equipment refactor and spawn with outfit on transform/reincarnate 2019-06-09 21:46:41 +02:00
variableundefined
19c8a8265e Merge pull request #11486 from Tayyyyyyy/better_ert_spawn
Non-blocking ERT selection/spawn
2019-05-17 23:07:30 +08:00
tayyyyyyy
665659bd88 Asynchronously spawn ERT 2019-05-09 11:52:28 -07:00
AffectedArc07
ec790efeaa SSticker 2019-04-30 16:47:47 +01:00
Kyep
1b9fe80d4f Fixes/refactors unspawnable ERT alert 2019-04-22 07:03:55 -07:00
AffectedArc07
52dff88bd9 Die monster! You don't belong in this world! 2019-04-17 16:30:43 +01:00
Fox McCloud
d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
datlo
aeb1ed6007 make new proc that actually works 2019-01-11 20:55:12 +00:00
datlo
645e242ea6 Fix disability removing on ERT/Nuke ops/ayy 2019-01-11 19:20:46 +00:00
Spartan6
1af3259a9c Added advanced analyser instead to medical bag, tweaked grammar on surgery belt and renamed Chief Engineer's toolbelt to advanced toolbelt. 2018-12-26 00:21:51 +00:00
Spartan6
ed00d4c838 Adds flashlights to ERT, gives medical advanced medical analysers, gives Red ERT engineer Gamma suit 2018-12-25 20:38:29 +00:00
Kyep
b4acc30b2e removes alignment system 2018-11-28 19:23:26 -08:00
Kyep
a8ce5cdc2a adds sanctified red/gamma ERT nullrods 2018-11-25 16:18:32 -08:00
Kyep
f901cf3893 ERTs now count as 'good' aligned chaplains for nullrod purposes 2018-11-24 19:53:34 -08:00