Commit Graph

954 Commits

Author SHA1 Message Date
S34N
952cfd7dc4 why was his done this way, wtf (#16877) 2021-10-04 20:17:00 +01:00
AffectedArc07
129318891d Nukes spacepods and associated jobs 2021-10-02 13:16:24 +01:00
Fox McCloud
1c40951338 Ports Cloth Golems 2021-09-24 19:48:15 -04:00
variableundefined
29f43ea3da Merge pull request #16732 from Qwertytoforty/red-blue-green
Changes the description of a drop of blood
2021-09-23 18:32:19 -05:00
Stokes52
119385057b Apply changes from AffectedArc's code review
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-09-19 07:43:00 -07:00
Stokes52
4942ef2444 Update lootdrop values to match the new items added 2021-09-19 07:42:53 -07:00
Stokes52
6c3675ad0c Add voice modulator mask for crafting and traitor uplink 2021-09-19 07:42:21 -07:00
Qwertytoforty
c5088eb8d8 Changes the description of a drop of blood 2021-09-18 19:21:37 -04:00
variableundefined
fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines
Adds defines for damage flags
2021-09-17 22:10:20 -05:00
S34NW
523c7786b2 spawner 2021-08-28 15:17:31 +01:00
Mieszko Jedrzejczak
559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
SabreML
d03fc7ea1c Update mapping_helpers.dm (#16538) 2021-08-15 01:18:05 +01:00
variableundefined
aa820ab123 Merge pull request #16291 from SabreML/brass
Craftable brass sheets
2021-08-13 23:40:03 -04:00
SabreML
5cd4e55063 'Unrestricted access from direction' for windoors (#16501)
* Unrestricted Windoor Directions

* Mapping helpers
2021-08-12 13:05:42 +01:00
Sirryan2002
9bf4d7ad84 Sets a Mob Cap for Giant Spiders (#15923)
* Counting and Capping for Giant Spider Spawning

* Moves magic numbers into defines

* Apply suggestions from code review

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

* Update code/controllers/subsystem/mobs.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* makes requested changes

* I hope to god this fixes this

* implements requested changes

* removes double parent call

Co-authored-by: dearmochi <shenesis@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-08-05 21:23:01 +01:00
SabreML
02fe0876f5 Fix bundle #3 (#16411)
* Explosive implant

* Package wrapper

* Venus human trap sprites

* Vine damage

* Wisp vision

* Display case

* Storage viewing

* Ghost poll nullspacing

* Inflatable barrier piercing

* Pneumatic cannon

* Cow grammar

* Centcom jaunting

* Consistency

Not actually a lazy list, as far as I can tell

* Review 1

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Review 2

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* length()

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-08-05 11:04:27 +01:00
SabreML
bb82a58c8f Merge remote-tracking branch 'upstream/master' into brass 2021-08-04 19:32:12 +01:00
Fox McCloud
4dffbd67ed Merge pull request #15139 from SabreML/rainbow-gibs
Species Gib Colours
2021-07-26 15:18:32 -04:00
variableundefined
ec7206e612 Merge pull request #15599 from SabreML/flyswatter-fix
Fixes the flyswatter not swatting flies
2021-07-26 13:36:54 -04:00
variableundefined
d91c8ba479 Merge pull request #15980 from AffectedArc07/toml-config
[READY] Converts configs to use TOML + Configuration refactor
2021-07-25 08:26:29 -04:00
dearmochi
712721fbc6 [READY] Reworks and Refactors Hallucinations (#15360)
* Hallucination rework start

* Chaser/Attacker, Abduction

* Moderates

* Majors

* saber alter

* address SteelSlayer

* Fix admin logging and runtime

* put hallucination logging on ATKLOG_ALL
2021-07-13 14:27:14 +01:00
AffectedArc07
9ddf4ceb97 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-07-09 11:42:23 +01:00
Qwertytoforty
f8bc686abb Adds the B.S.G (#15798)
* Adds the 100% original and serious BSG

* Adds sprites

* prevents divide by zero

* Adds to protolathe, shield from projectiles, prevents hitting through walls

* adds sprites for inhands, pain, and suffering

* Finished the gun sprites.

* Adds admin version, sound effect, visual

* moves chain to base projectile, adds shitty sprite for bsg explosion

* Fixes it, maybe.

* I hate merge conflicts, gun sprites are back

* I need this, it seems.

* re-adds sprites back

* Prevents turrets from working with BSG, adds a variable for it, heavily nerfs the BSG stun to be more of a trip

* Apply grammer and spaceing suggestions from code review

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

* Makes the code clearer, use update icon, fix shaded charge

* Better inhands, tweaked base sprite

* Better explosion effect, mochi suggestion, PR ready

* Accidently removed this

* I did not intend to put this in, I discarded this change

* Update settings.json

* Spelling and return removal

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Removes spawn, makes it a callback

* Lowercase states

Co-authored-by: dearmochi <shenesis@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-07-08 22:48:54 +01:00
Qwertytoforty
8dcb2c1a0f Prevents final summon rune by being cleaned by normal methods (#16224)
* Prevents final summon rune by being cleaned by normal methods

* Makes it a proc

* Moves cleanable, makes it work with space cleaner
2021-07-08 22:20:32 +01:00
SabreML
4a3a726c76 Brass Construction 2021-07-03 10:40:03 +01:00
Qwertytoforty
1b1f49ac81 Adds the Emergency Extraction Flare (#16220)
* Adds the Emergency Extraction Flare

* removes extra message

* Apply suggestions from code review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Apply suggestions from code review

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

* All I ever get, is a pain in the ash... 🎵

* Affecteds requests part 1

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Use populate_contents

* Update code/modules/mining/equipment/wormhole_jaunter.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-07-02 21:32:45 +01:00
hal9000PR
27fe4da2df Hand tele portals malfunctions teleport to random Z levels (#16126)
* thinking about portals

* affected's suggestion

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* teleporter machine change

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-06-29 11:46:13 +01:00
SabreML
b45ee602bd Merge remote-tracking branch 'upstream/master' into flyswatter-fix 2021-06-21 21:03:30 +01:00
AffectedArc07
f3c314f07b Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-06-03 18:10:19 +01:00
Adrer
740ac16074 sol trader lootdrop autosurgeon now of the organ subtype (#16098)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2021-05-27 15:59:41 +01:00
AffectedArc07
7486d026b7 READY 2021-05-23 17:26:17 +01:00
Farie82
e3ba0203b2 Adds grouped spawners. Makes spawning unique things easier. (#15956)
* Adds unique spawners
Makes spawning unique things easier.

* Refactor + comments update

* Some more info

* Slight refactor and path change.
group_id instead of key_override
comment changes

* File name change

* isnull check. Makes 0 as value valid
2021-05-16 11:41:06 +01:00
SabreML
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
SabreML
48b1ecac2c Merge remote-tracking branch 'upstream/master' into flyswatter-fix
To trigger the RUSTG CI
2021-04-29 15:23:55 +01:00
SabreML
0eaec89adb Soup Drinking (and custom soups!) (#15620)
* SOUP

* Space stuff

it compiled before I swear

* =
2021-04-15 22:04:24 +01:00
Vi3trice
f0841b3629 Go away you heathen (#15737) 2021-04-07 19:27:51 +01:00
SabreML
f54b7e5f71 Mochi Review
And a couple of other things too.
2021-03-30 16:06:37 +01:00
SabreML
790d306a01 Merge remote-tracking branch 'upstream/master' into rainbow-gibs 2021-03-30 15:07:20 +01:00
Qwertytoforty
2e4e0d2e91 Adds reactive teleport armor construction, ports repulsive armor from TG (#15343)
* Adds reactive teleport armor construction, ports stuff from tg to do it

* Adds description to what disabled does in code

* Fixes ashwalker tendril anomaly

* SaberML code suggestions

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

* True or false

* Keeps reactive armors from triggering from kisses

* removes stun check

* oops

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-03-30 11:55:31 +01:00
Ryal
e7310cac9b Adds missing things to drone cleaning (#15553)
* Adds missing things to drone cleaning.

* Update code/game/machinery/doors/airlock_electronics.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/game/machinery/doors/windowdoor.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/game/machinery/doors/airlock.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/game/machinery/doors/airlock.dm

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

* Moves destroyed electronics to emag_act

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
2021-03-28 12:45:29 +01: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
Fox McCloud
f65c8994ce Broad TG Sound Update (#15608)
* Broad TG Sound Update

* jester update
2021-02-27 11:59:33 +00:00
Fox McCloud
78cb60f160 Fixes Some Sounds Having Reverb (#15602)
* Fixes Some Sounds Having Reverb

* typeless
2021-02-24 09:34:34 +00:00
SabreML
6a100c4889 Swatting 2021-02-23 22:31:58 +00:00
Fox McCloud
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 McCloud
8947e97f3b Refactors Electrocution and Tesla Zapping (#15357)
* Refactors Electrocution and Tesla Zapping---Improves Supermatter and Tesla

* forgot this one

* fixes and styling

* last tidbits hopefully

* machine frames

* use flags

* styling
2021-02-03 20:52:03 +00:00
Fox McCloud
6074323192 Further Updates Windows (#15427)
* Further Updates Windows

* correction
2021-02-03 10:04:52 +00:00
Fox McCloud
5211cfe8a9 Transitions to Full-tile Windows (#15385)
* Transitions to Full-tile Windows

* tweaks

* bump fix and RCD inclusion

* no colors

* debris refactor

* even better
2021-02-02 20:50:47 +00:00
AffectedArc07
f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00