Commit Graph
215 Commits
Author SHA1 Message Date
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
SabreMLandGitHub 3d6e072464 A lot more Cult fixes (#15161)
* Some fixes

1: ERT members can no longer be given as an assassinate/sacrifice antag objective.
2. Cultists attempting to teleport to a deleted rune will no longer be teleported into nullspace.
3. Re-ordered the cult Blood Rites spell code because it was bugging me. (sorry qwerty)

* Cult stuff

1: Cultists can no longer be chosen as a sacrifice target
2: Rune drawing is limited to one at a time (No spamming on one tile)
3: Removed some unneccesary `/improper`s from area names, for the cult Summoning locations
4: Changed a couple of colours to use defines

* QDELETED()

* Eye colour fix

* Reorganisation, Objectives, and Gender

The majority of the changes here are just reordering the procs, but there's a few fixes too:

1. Roundstart cultists now get given the 'servecult' objective.
2. Deconverting someone now removes their 'servecult' objective, so they won't be notified about target changes.
3. Stopped summoned ghosts from experiencing a spontaneous gender change.

* Screwdriver fix

* Prayer bead stripping

* Some more construct fixes

1: Fixed *all* holy constructs getting the 'Summon soulstone' ability
2: Fixed Wraiths getting their blue light reset to red after jaunting
3: Added a 'holy' variable to constructs, and made the holyification its own proc.

* qdeleted

* Construct Converting

Apparently you can convert holy constructs. Who knew!

* Another two weeks

Moved all the construct icon states to their own file, and fixed Nar'Sie constructs not getting a glowing effect.

* Grab fix

Fixed upgrading a grab having the ability to potentially transport the victim across dimensions.

* Not actually a cult fix but eh

Fixes: Runtime in outfit.dm, 114: bad number
And updates the cult corpse from legion spawns

* Teleport spell effect

Fixed the teleport effect for the spell being attached to the wrong mob.

* Small cleanup

* Eye colour cloning fix

* Veil Shifter

Fixed:
Runtime in cult_items.dm,355: pick() from empty list
Veil shifters not retaining any grabs after teleporting.

* Adjacent
2021-05-16 11:33:07 +01:00
Fox McCloudandGitHub 4052e2b49e Fixes Some Issues With Cybernetic Eyes (#15666) 2021-03-05 14:48:28 +00:00
Fox McCloudandGitHub 926d484277 Moves External Organs to Nullspace (#15548)
* Moves External Organs to Nullspace

* additions

* oops

* further cleanup
2021-03-03 21:34:49 +00: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 efa3aecb61 Ports TG Pickup, Equip, and Drop Sounds (#15572)
* Ports TG Pickup, Equip, and Drop Sounds

* really
2021-02-24 12:51:59 +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
FreeStylaLTandGitHub 573520fc1e Changes HoS outfit and adds an assistant outfit for Plasmamen (#15316) 2021-01-24 13:36:54 +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
datlo d0c0e4a207 trailing newlines 2020-05-02 11:00:50 +02:00
datlo 7b2c9d9564 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into wizloadouts 2020-05-02 10:25:05 +02:00
Crazylemon64 fc8dcff9b6 Outfits without a name will now be obvious 2020-04-10 22:39:42 -07: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
datlo 19b7dc30df Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into wizloadouts 2020-04-04 13:04:54 +02:00
datlo be91b68214 Add mime robe, plasmaman wiz outfit 2020-03-26 14:20:04 +01: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
AffectedArc07andGitHub 04ba5c1cc9 File standardisation (#13131)
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
2020-03-17 18:08:51 -04: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 f694b483cf include new outfit data 2019-08-25 18:25:52 -04:00
Fox McCloud 9a4834a565 Merge remote-tracking branch 'upstream/master' into hardsuit-helmet 2019-08-25 18:15:10 -04:00
Fox McCloud dd346515e5 additional suits 2019-08-25 17:42:48 -04:00
Fox McCloud 85c6997584 Merge remote-tracking branch 'upstream/master' into plasmamen-rework
# Conflicts:
#	code/modules/mob/living/carbon/human/update_icons.dm
#	icons/obj/device.dmi
#	paradise.dme
2019-08-25 16:51:21 -04: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
Fox McCloud 195d8a68ec final commit 2019-08-12 00:07:22 -04:00
Fox McCloud 39c9e9abde Reworks Plasmamen 2019-08-11 18:56:32 -04:00
Mark van Alphen ef16165471 More outfit fixes 2019-06-09 23:27:06 +02:00
Mark van Alphen 3728e5efe4 More outfit improvements 2019-06-09 22:47:47 +02:00
Mark van Alphen f2e32dad07 Add accessory/internals box support, add cybernetic implants support to new outfit system 2019-06-09 22:21:25 +02: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
Mark van Alphen e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00