Commit Graph

1604 Commits

Author SHA1 Message Date
variableundefined 517f5e8304 Revert "Adds glass floors" (#16524) 2021-08-11 21:18:49 +01:00
variableundefined d8bfbe307a Merge pull request #15929 from S34NW/tgglassfloors
Adds glass floors
2021-08-11 16:08:09 -04:00
variableundefined 99e8487bfd Merge pull request #15656 from Qwertytoforty/I-guess-I-port-stuff-now-huh
Adds supermatter sliver steal and plutonium core steal objective from TG
2021-08-11 16:05:24 -04:00
S34NW ea87e351a2 Merge branch 'master' into tgglassfloors 2021-08-05 15:17:09 +01:00
Qwertytoforty c45a359769 Grammer and style
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-07-28 18:21:58 -04:00
variableundefined fba7585b4e Revert "Increases most radiation dose amounts" (#16445) 2021-07-28 10:11:27 +01:00
E-MonaRhg 6da7633122 Re-adds what was removed 2021-07-27 19:17:47 +02:00
E-MonaRhg 4ee75ce29d Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-27 16:37:58 +02:00
Fox McCloud 7b5db2d085 Merge pull request #16123 from Arvenius169/Replaces-between()-With-Native-clamp()
Replaces between() With Native clamp()
2021-07-26 15:36:20 -04:00
SabreML 2c0ae9c500 Refactors the 'Examine' status tab (#16330)
* Removes the 'Examine' tab

* Revert "Removes the 'Examine' tab"

This reverts commit 0dd01722c9.

* Initial system and misc items

* Atmospherics

* Engineering

* Medical

* Mobs

* Stacks

* Structures

* Turfs & Weapons

* Final stuff and bad documentation

* Sheer laziness
2021-07-26 18:11:57 +01:00
variableundefined 09a5988ce2 Merge pull request #16147 from S34NW/rad_damage_normalise
Increases most radiation dose amounts
2021-07-25 09:15:40 -04:00
variableundefined 7526d01c67 Merge pull request #15760 from hal9000PR/FUSION-FRENZY
Adds an interaction between two SMs when they collide.
2021-07-25 09:01:00 -04:00
Qwertytoforty eeb8f7054c Order tweaks, removal of duplicate 2021-07-23 14:36:18 -04:00
Qwertytoforty 6f6d04f8f7 Merge remote-tracking branch 'upstream/master' into I-guess-I-port-stuff-now-huh 2021-07-23 10:35:54 -04:00
S34NW 85b9adc5a8 Merge remote-tracking branch 'upstream/master' into tgglassfloors 2021-07-18 19:57:12 +01:00
E-MonaRhg f83b8ae14e Suggested stuff 2021-07-09 19:44:02 +02:00
AffectedArc07 9ddf4ceb97 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-07-09 11:42:23 +01:00
Fox McCloud dad52950ff Merge pull request #16156 from ppi13/singularity-radiation-fix
Fixes singularity radiation not reaching rad collectors
2021-07-08 20:13:38 -04:00
E-MonaRhg c303a2b3f2 Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-09 00:03:38 +02: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
hal9000PR 3f6eac48d1 Fixes getting TK abilities when you shouldn't (#16300)
* fix

* oops

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

* review

* oops

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-07-07 19:22:49 +01:00
S34NW 2414afc550 stare at the supermatter in this brand new update! 2021-07-05 22:53:55 +01:00
Fox McCloud d9d09deb00 Merge pull request #16212 from AffectedArc07/atom-rotation
Better atom rotation
2021-07-01 22:15:58 -04:00
Qwertytoforty bcb0cbe5cb Prevents built APCs from being hacked, Prevents AI from loosing points from apc destruction (#16192)
* Prevents built APCs from being hacked, prevents deconstructing apcs from removing malf points

* Spacing

* whoops

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

* Affecteds other suggestions.

* Grammer changes

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

* And autodoc for steel

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-06-29 11:44:18 +01:00
Qwertytoforty e4461eac09 Please don't break 2021-06-28 19:12:39 -04:00
AffectedArc07 ed11899f11 Merge branch 'master' into toml-config 2021-06-23 08:44:32 +00:00
S34N 04628f7df4 Merge branch 'master' into tgglassfloors 2021-06-20 16:32:22 +01:00
SabreML 0b375de42c Removes the the vast majority of 'The the' from the the code (#15597)
* The the

* Some more

* Review 1

* A couple more
2021-06-20 10:20:32 -04:00
AffectedArc07 066c61dccd Better atom rotation 2021-06-19 18:14:37 +01:00
ppi13 79fe4f7dd2 Fixes singularity radiation not reaching rad collectors 2021-06-11 18:23:06 +02:00
S34NW 616e641d71 RAD_DOSAGE_MULTIPLIER is a better name 2021-06-10 09:58:18 +01:00
S34NW 396309095d further tweak the properties 2021-06-09 18:12:02 +01:00
S34NW 9100dc2fcd Non-SM rads are a danger. Delam gives more rads. 2021-06-09 14:48:42 +01:00
AffectedArc07 f3c314f07b Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-06-03 18:10:19 +01:00
Arvenius169 1202954e09 Replaces all occurrences of the between() proc with the native clamp() proc 2021-06-02 17:31:05 -04:00
Qwertytoforty 0801a51d96 Logs pacman overheating (#16043)
* Logs pacman overheating

* Jump to it

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

* affected spells like teen spirit

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-05-29 21:19:29 +01:00
ppi13 01d2ffb08b Wires no longer gets destroyed by tesla (#16073) 2021-05-24 23:03:56 +01:00
SteelSlayer e4bbd94d6a Robot_module and cyborg stack refactor (#13527)
* robot_module refactor

* some fixes

1. adds medical stacks of 25 for the syndi medical borg
2. fixes various construction steps that weren't using `use()` or `get_amount()`

* review tweaks + other stuff

1. Makes a bunch of for loops into istypeless loops
2. Adds a readout of the current out of stacks a borg has, in the status panel
3. Slightly reorganizes the medical, syndi medical, engineering and syndi engineering cyborgs items

* fixes after upstream merge

* blank line for travis

* fixes and improvements

1. Fixed welder icon's not updating periodically if you were charging in a borg recharger
2. Fixes solar panels dropping /cyborg type glass when they were deconstructed.
3. Band-aid fix (incase #2 doesn't fix this) for cyborg stack's `source` var being null which resulted in tons of "cannot read null.energy" runtimes

* more fixes + constructable frame runtime fix

* removes toy sword placeholder

remove comment

* remove these as well

* .amount to .get_amount(), really should have done this before

* refactors robot_upgrades to work with the new system

- more cleanup
- adds documentation
- fixed a bug I made where you could delete your robot stack via crafting

* moves some unemag logic to the module file, makes more loops typless

* farie review

* fox review

* affected review and more TM bugfixes

* fixes comment

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2021-05-24 16:24:25 +01:00
AffectedArc07 d68480b8b4 Movement configuration 2021-05-17 17:47:34 +01:00
Qwertytoforty 359b3f6aa4 Merge remote-tracking branch 'upstream/master' into I-guess-I-port-stuff-now-huh 2021-05-16 09:19:08 -04:00
Pidgey 96ca2f826c Neither shields nor containment fields can be irradiated anymore. (#15940) 2021-04-25 15:07:54 +01:00
S34NW d50c7273fc more fixes 2021-04-23 19:55:09 +01:00
S34NW da9b4a80c9 mochi review 2021-04-22 20:53:46 +01:00
S34NW fbf958b6fc bad code, but tidier code 2021-04-21 23:42:20 +01:00
S34NW 11d46098cb i can see clearly now the plating's gone 2021-04-21 22:29:34 +01:00
E-MonaRhg 79512e1f72 Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-04-14 20:41:45 +02:00
dearmochi 71ddf21925 Adds volume channel for engine ambience (SM, Tesla) (#15845) 2021-04-10 12:10:22 +01:00
E-MonaRhg d52e6fb69e Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-04-06 02:37:13 +02:00
Vallidian 82194574f5 SM Delam station wide siren (#15758)
* SM Delam station wide siren

Adds some fluff to the SM when it hits 0 integrity. Sounds a global siren signifying a "meltdown" or delam is imminent.

🆑
add: adds a global siren shortly before delam.
/🆑

* Adding zlevel check for alarm

Thank you hal9000 and kyet for helping :)

Co-authored-by: Kyep <16434066+Kyep@users.noreply.github.com>

Co-authored-by: Kyep <16434066+Kyep@users.noreply.github.com>
2021-04-05 17:49:27 +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