Commit Graph
96 Commits
Author SHA1 Message Date
b2bdb80ec5 Refactors Deathsquad, adds more customization to their spawning (#18135)
* a new coat of paint

* no shooting teammates on spawn for 100 damage

* datumization part 1, makes DS more OP, spacing fix

* hnng still broken but better

* breaks stuff less 99%

* mostly tgui

* oops, removes left over things from testing

* seperate tgui

* undo changes to ERT file and ERT manager

* build TGUI, front end is working

* minor fix, still broken

* this hurts me

* few small changes

* please dont fail

* mind code runs, but it doesnt work

* logging good, tgui built, will finish later

* mind code hurts, tgui should deconflict

* part one of giving up on TGUI

* 3 days of debugging, 2 lines of errors fixed

* no more unneccessary spawners

* Revert "no more unneccessary spawners"

* wow it works

* tgui, deconflict please

* a little clean up

* little more cleanup

* Sirryan addressed pt1

* Oops should commit this before the next commit

* DS isnt an option in one click antag, nuke it

* oops forgot this one small bit

* wow, simple code works

* oops, forgot to address, doesnt fix headset

* ds headset was broken long ago

* removes testing implants

* addresses requests

* get addressed code, you will be good

* few code improvements

* address moxian

* Makes deathsquad naming consistent

* this comment is true again

* a little precaution to stop AFKs

* no nuke code? no problem

* bing bam boom, more addressing

* no more runtimes I think

* clarified a few things

* gloves now show again following #18190

* Update code/game/objects/items/weapons/explosives.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* okay I'm a bit stupid

* deathsquad jumpsuit desc update

* CI my beloved, have a fix

* deathsquad gets their proper icon

* Revert "deathsquad gets their proper icon"

This reverts commit a52519305b.

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-09 15:25:35 +01:00
Tourte-YayaandGitHub a5d8468ce4 Replace the existing nutriments implants to hardened one for the rest of the admin jobs. (#17358) 2022-01-22 19:07:13 +01:00
a0e5d6df44 Datumized vampires (#17166)
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
2022-01-18 21:16:09 +01:00
AffectedArc07andGitHub 1c8a28425a Removes heist mode & associated code (#17256) 2022-01-11 11:36:57 +01:00
Fox McCloudandGitHub 55a6c23bc7 Removes civilian: Return of the Assistant King (#17103)
* Removes Civilian

* other alt-titles as well

* further resolution

* forgot these

* TGUI

* hud icon
2021-11-16 19:49:08 +01:00
634f9c72f1 Vampire Rework. (#16476)
* vampire rework

* fixes and tweaks

* cleanup + tweaks

* grug stomp

* TGUI

* TGUI rebuild

* UID fix

* debugging cooldown fix

* first review changes

* subclass refactor

* tweaks + some sprites

* blackbox logging

* tweaks + grammar

* minor UI tweaks

* ability icon sprites.

* placeholder sprite warning fix

* melee mod code comment warning

* nullification rework

* final sprites!

* fixes

* sabre review pt 1

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* sabre review pt2

* sprites readd

* tgui rebuild

* removes traitor vampires

* fixes

* readds sprites

* runtime fixes

* hotfix

* more runtime fixes

* glare tweak. less confusing when the vampire is stunned.

* gargantua nerf

* minor tweaks.

* hemomancer nerfs

* bugfixes and cleanup

* I did a dumb

* couple of fixes

* confusion and shadow snare fixes

* hemomancer nerfs part 2 electric boogaloo

* TGUI rebuild

* fixes and easier events

* Umbrae tweaks

* gargantua tweak

* umbrae nerf 2 electric boogaloo. also var edit suggestion

* runtime fix

* buffs blood nutrition to be in line with its metabolic rate

* Henk stuff

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* more review changes

* final tweak

* affected request + runtime fix

* FUCK

* fat fucks

* darkness tweaks

* UMBRAE AAAAAAAAAAAAAHH

* force doors bugfix

* either git or I am drunk

* admin rejuv fix

* I CANNOT SPELL

* shitnt code

* steel review

* tgui rebuild

* mochi review

* vampire ability usage logging

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-11-14 15:34:56 +01:00
S34NW fa88d21ae4 Merge branch 'master' into solgov_ERT 2021-08-06 15:47:40 +01:00
64930de41c Makes all toy figurines tiny and refactors the code behind it (#15368)
* Makes toy figures tiny and refactors the code behind it

* Apply suggestions from code review

Co-authored-by: dearmochi <shenesis@gmail.com>

* atom_say and capitalize names

* Web edit baby

* Merge conflict fixes

* Init instead of New

* prize_ball instead of mechball

* prize_ball should not be a figure. Revert but keep the Init change

Co-authored-by: joep van der velden <15887760+farie82@users.noreply.github.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
2021-07-15 13:59:26 +01:00
S34NW 59938c00e5 Merge branch 'master' into solgov_ERT 2021-07-10 15:43:33 +01:00
S34NW b8ff112b43 updates 2021-07-10 15:41:42 +01:00
e835205f50 Alphabetize items in debug equipment selection menu. (#14641)
* Alphabetize items in debug equipment selection menu.

* Rename some outfits to group them together in the selection menu.

* Farie's suggestions

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-07-08 23:10:39 +01:00
Fox McCloudandGitHub f5af21b794 Merge pull request #16213 from AffectedArc07/nukes-awful-code
Removes some oldcode
2021-07-07 09:57:16 -04:00
AffectedArc07 4fa871136f Sabre suggestion + Runtime fix 2021-07-02 17:24:14 +01:00
AffectedArc07 38fdfa5813 Refactor honksquads 2021-07-02 16:55:53 +01:00
datloandGitHub 7de29bd81f Replace nukie jetpacks by oxygen tanks (#16101)
* Replace nukie jetpack by oxy tanks

* replace all harnesses
2021-06-29 11:46:43 +01:00
S34NW d5f3d55a94 Solgov is now ERT, also solgov SOO is now a thing. 2021-06-10 20:28:56 +01:00
S34NandGitHub 265053f966 makes sol trader IDs properly update (#16137) 2021-06-08 15:05:00 +01:00
S34NandGitHub 365fc87dbf Fixes a bug with solgov beret sprite (#16040)
* fix 1

* also catches a bug with TSF rep sechud icons
2021-05-17 12:51:15 +01:00
S34NandGitHub ae6f6148c2 Solgov tweaks (#15896)
* marines, solgov, and more!

* belts are belts

* forgot da hat

* swapped guns around, loadout hat no longer strong

* Update code/datums/outfits/outfit_admin.dm

* updated shading on uniforms

* yeets a null entry

* gas masks, flipped caps

* renamed gas masks

* merge conflicts

* dmi conflicts confuse me

* ARG mag update
2021-05-16 11:38:16 +01:00
Fox McCloudandGitHub 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
Fox McCloudandGitHub 02b9445b9b Refactors DNA Mutations; Refactors Mutations to use Traits (#15483)
* Refactors Mutations

* traits

* more work

* styling fix

* yet even more work

* oh hush

* almost there

* it continues yet further

* and that's genetics done

* and that's it folks

* last bit and golem fixup

* oof

* oops

* tweaks and fixes

* styling
2021-02-21 21:25:19 +00:00
Fox McCloudandGitHub 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
f6b8fe5547 Makes CNS rebooter stun on EMP (#14234)
* Makes CNS rebooter stun on EMP

* Kyets requests

Co-authored-by: Qwertytoforty <qwertytoforty@gmail.com>
2020-09-18 10:44:38 -04:00
TDSSS 222def424c Nt undercover changes 2020-08-16 13:39:38 +02:00
Fox McCloudandGitHub 40baacc405 TG Label Component Port (#13449)
* TG Label Component Port

* every time I swear
2020-05-24 13:55:05 -04:00
4655e5d9d1 Fixes default-named admin outfits (#13280)
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-04-10 22:56:54 -06:00
TDSSS 2562323e5c Merge branch 'master' into wiz-armor-fix 2020-03-22 03:39:18 +01:00
AffectedArc07andGitHub 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
TDSSS d4a55be805 Merge branch 'master' into wiz-armor-fix 2020-03-18 00:23:54 +01:00
TDSSS e364612d2a Arch wizards get actual space suits 2020-03-10 13:03:07 +01:00
AffectedArc07 c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
Fox McCloudandvariableundefined 652920ae3c Wizard Battlemage Armor (#12388) 2019-09-24 15:42:47 -07:00
farie82andGitHub 9d58af6ec5 Merge branch 'master' into hoodies 2019-08-30 22:57:07 +02:00
Fox McCloud cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
farie82andGitHub 3b433fbce5 Merge branch 'master' into hoodies 2019-08-15 18:10:31 +02:00
Mark van Alphen e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
joep van der velden 6025f402ce refactored hoodies to work without antidrop 2019-03-26 20:37:20 +01:00
variableundefinedandGitHub 1c16e4c9de Merge pull request #10685 from datlo/SSThardsuitnammo
Updates Syndicate Strike Team gear, ready room, and shuttle
2019-01-22 06:31:09 +08:00
Spartan6 3f6e927a43 Adds classic baton and a cargo cap to Sol Traders 2019-01-20 17:14:01 +00:00
datlo 783824b5e9 Updates SST, room, and shuttle
Changes to SST gear
- Added syndi internals box
- Replaced pressurized oxy tank by nukie jetpack
- Replaced reinforced spacesuit by reinforced elite hardsuit. Armor is
below dsquad armor, however you can turn it to combat mode, making you
much more mobile. Looks the same as the nukie elite hardsuit, for now, I
don't think it's a problem tho.
- Replaced pistol by syndicate revolver, aswell as the extra ammo. SST
can now print extra ammo at hacked autolathes to keep the fight going if
they run out due to this.
- Added a spare mag for the SAW
- Added a military belt (different color to match the hardsuit)
- Removed flashlight and EMP grenade
- Removed all access on SST IDs. They still get access to maintenance
and station exterior airlocks so they don't have to break in to enter
the station. They're still agent IDs, so you got syndi access, can copy
access, customize, etc.
A lot of this gear no longer spawns on the SST at spawn, and is instead
in the new SST lockers.
Admin outfitted SST are spawned with their full gear, which was also
updated.

Map changes
- Added 3 syndicate bombs beacons, a bomb detonator, 2 upgraded health
analyser, a syndi toolbox, 2 multitool to the SST ready room
- Added 6 SST lockers, containing EVA gear and SAW + ammo
- Fixed issues with the blast doors for the SIT and SST shuttles, both
sets of blast doors now open and close together, they can also be opened
from inside and outside the shuttle now. This lets you lock your shuttle
safely from anyone that doesn't have syndicate access, an emag, or can
just bypass the blast doors somehow.
- Added atmospherics blocking fans to the SIT and SST shuttle since they
don't have a cycling airlock and do not usually dock at a designated
docking station. This helps prevent the SIT (who do not start with EVA
gear) spacing themselves by going through the wrong door.
- Added an oxygen cannister and two syndicate sleepers to the SST
shuttle, removed the obsolete toxin bombs spawner (replaced by syndicate
bomb beacons in ready room)
2019-01-20 16:17:51 +00:00
Kyep e06b8f39cc adds hand labeller to trader default items 2019-01-10 14:42:36 -08:00
Kyep bf9d0b088f merge conflict fix, reset map 2019-01-07 16:37:07 -08:00
Kyep 0567eab562 Merge branch 'sol_trader_update' of https://github.com/Kyep/Paradise into sol_trader_update 2019-01-03 14:40:07 -08:00
Kyep d488195799 fix merge conflict, wipe map changes 2019-01-03 14:39:41 -08:00
datlo 61c0f71cce Replaces uplink management by automated sharing
Various admin outfits changes
Add internal box to honk brand infiltration kit
Add fifty TC stack buyable by nukies
Add subtypes of uplinks : Traitor, Nuclear, SIT, SST, Admin, only
checked by auto sharing for now
2019-01-03 16:29:31 +00:00
Kyep 46acb9338b sunglasses, seeds, KA, IMS, fleshy 2018-12-22 14:16:25 +00:00
Kyep 702f4db165 outfit, vehicles, paperfix, viruses 2018-12-12 00:31:56 -08:00
datlo 19e5271249 Added syndicate officer as a job proper 2018-12-07 11:07:49 +00:00
Kyep 39b6725555 hellhound + minor tweaks 2018-11-20 15:19:19 -08:00
Kyep 018519044f deletes unathi breacher 2018-11-18 16:56:29 -08:00