Commit Graph

23353 Commits

Author SHA1 Message Date
AffectedArc07
bede78aeff Removes table prefixes 2021-07-26 17:21:24 +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
53f489d766 Merge pull request #16132 from Leanfrog/Sec-Bomber-Jacket-Armor-+-Loadout
Standardizes Sec Bomber Jacket Armor And Adds To Loadout
2021-07-25 09:15:08 -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
Samman166
64349fa7db Adds hardened versions of thermal and x ray eyes and replaces old ones bought by nuke ops (#16055)
* Adds hardened versions of thermal and x ray eyes and replaces old ones bought by nuke ops

* Update code/modules/surgery/organs/eyes.dm

grammar changes

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

* gives SOOs hardened X-ray eyes

* Grammar fix

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

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2021-07-25 13:38:43 +01:00
variableundefined
b9aa1facce Merge pull request #15757 from warior4356/holy-chapel
Makes the chapel holy once more.
2021-07-25 08:37:18 -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
SabreML
865b19263c I am an idiot (#16421) 2021-07-25 11:37:15 +01:00
datlo
daf2453d15 Add new lawsets and reorganise AI upload, the Third (#15743)
* lawsets update

* Revert "lawsets update"

This reverts commit a68ddcb9ee.

* Lawsets update

* Remove quotes on ai module names

* fix map file

* Fix coding style

* Update hippocratic per review

Co-authored-by: Sean Williams <06sean@gmail.com>

* Update hippocratic per review

Co-authored-by: Sean Williams <06sean@gmail.com>

* Update hippocratic per review

Co-authored-by: Sean Williams <06sean@gmail.com>

* Fix merge conflict

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

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

* Add a pilot seat to the ERT shuttle

* Revert "Add a pilot seat to the ERT shuttle"

This reverts commit 676bfa7d03.

* Update MetaStation.dmm

* deconflict

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

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

Co-authored-by: Sean Williams <06sean@gmail.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-07-25 10:19:58 +01:00
warior4356
ab2268f66a Fixed Golems escaping servitude with new bodies (#16340)
* Fixed Golems escaping servitude

* Keeps free golems free
2021-07-25 10:14:44 +01:00
warior4356
e091faaef9 Fixed IPCs and Golems unequipping jumpsuit slot items on update (#16338)
* Fixes IPCs and Golems unequipping

* Formatting fixes

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

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-07-25 10:14:13 +01:00
SteelSlayer
6a72cdb79a [TGUI] Cyborg self diagnosis report (#16345)
* tgui diagnosis

* mochi and sabre review

* final tweaks (maybe)

moves getDamageColor out of component
makes silicon subsystems GC better

* Update tgui.bundle.js
2021-07-25 10:10:44 +01:00
SabreML
fe6e445760 Manual ore redemption (#16414) 2021-07-24 10:26:07 +01:00
variableundefined
dc9ce6dad7 Merge pull request #16405 from AffectedArc07/removes-headcrabs
Removes headcrabs
2021-07-21 05:12:10 -04:00
SabreML
150e7e3f60 Painter Item Refactor (#15828)
* Modular Painter V1

* Improved Suicide

* Type & Text

Also `item_state` just goes from `icon_state` so it's not needed.

* Modular Painter V2

Big refactor of everything to use datums rather than separate objects.

* Steel airlock stuff

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

* Vile Heresy

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>
2021-07-20 15:25:45 +01:00
AffectedArc07
f91883814d Merge remote-tracking branch 'ParadiseSS13/master' into removes-headcrabs 2021-07-20 10:27:35 +01:00
SteelSlayer
dab535ef16 cyborg laser fix (#16399) 2021-07-20 08:18:28 +00:00
hal9000PR
c5e593b2bf fix (#16388) 2021-07-19 00:33:23 +01:00
warior4356
ba8052af3f Apply suggestions from code review
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-07-15 18:44:23 -07:00
dearmochi
f8d510e7f5 Lightly refactors human Initialize() (#15738)
* Refactors human Initialize

* spelling

* use ComponentInitialize()

* 🇬🇧
2021-07-15 22:07:24 +01:00
Farie82
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
AffectedArc07
62f15c1cf0 Removes headcrabs due to licensing issues 2021-07-15 13:56:03 +01:00
hal9000PR
3eb3bdcdc7 indestructable walls (#16362) 2021-07-14 15:01:28 +01: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
34abcde0e3 Fuck I forgot this 2021-07-13 14:25:20 +01:00
AffectedArc07
035964ceb2 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-07-13 14:25:12 +01:00
SteelSlayer
5124f5ef7e [TGUI] Adds a HUD management UI for ghosts (#16302)
* ghost hud panel

* changes up UI a bit, fix conflicts

* no resizable
2021-07-13 14:19:41 +01:00
Fox McCloud
b6b510c2f9 Merge pull request #16284 from AffectedArc07/sorium-ldm-nerf
Nerfs sorium and LDM
2021-07-13 00:41:05 -04:00
SabreML
102e42a381 heck (#16344) 2021-07-11 17:32:19 +01:00
SabreML
3e8482cebb Makes machine frames show their circuit name (#15025)
* Circuit Names Refactor

* Some review stuff

* now with less runtimes

* Machine Boards and Computer Boards

* Only a little late

* YouTool fix

* Resupply crate too

* Supplycomp board

I'll do the other stuff tomorrow

* Computer Frame Refactor

Plus also removing the HONKputer to avoid a conflict.

* Don't need this diff anymore
2021-07-10 19:43:40 +01:00
SabreML
568a8b17ce Makes all Terror spiders immune to dragging (#16325)
* Update white.dm

* Makes ALL spiders heavy
2021-07-09 15:05:48 +01:00
AffectedArc07
702500af9f Fox fixes. Foxes? 2021-07-09 11:52:13 +01:00
AffectedArc07
9ddf4ceb97 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-07-09 11:42:23 +01:00
SabreML
908c4f0dd1 Jobban adjustments (#16319)
* Borer ban

* Terror Spider jobban category

* Defines
2021-07-09 11:39:01 +01:00
S34N
31cec0d4de Removes fungus announcement (#16322)
* Crewmate victory

* removes setup
2021-07-09 11:38:01 +01:00
hal9000PR
9f008f3de4 jacobs ladder removal from tendrils (#16324) 2021-07-09 11:21:20 +01:00
warior4356
7a7364fcfd Adds critical as a state to the crew monitor (#16313)
* Adds critical as a state to the crew monitor

* TGUI rebuild
2021-07-09 11:21:04 +01:00
SabreML
b9a4929235 'Fit Viewport' & Scoreboard refactor (#16294)
* Fit Viewport V1

* Scoreboard

* Moderate scoreboard refactor

Mostly just removing the global variables, since Mochi has plans for a proper big scoreboard refactor in the future.
2021-07-09 11:18:05 +01:00
SabreML
5270cd53a9 Logging for AntagHUD and DNR (#16293)
* AntagHUD Logging

* Readability

* Persistent logging

Surprised that `create_log()` isn't doing this already.
2021-07-09 11:16:06 +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
Fox McCloud
ddea09dce2 Merge pull request #16082 from AffectedArc07/gc-improvements
GC ref finding improvements
2021-07-08 19:25:23 -04:00
Kepplerx
1d04a9ec74 AI Detector can now only detect AI, not Abductors, Xenobio consoles or Shuttles (#15535)
* Update navigation_computer.dm

* V7

* Update navigation_computer.dm

* All instances

* Added explainers

Seems this is done some places, seems nice and easier to understand with em

* Updated name

* Change Variable name

Changed as per advise of Fox
2021-07-08 23:18:15 +01:00
moxian
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
SabreML
1455af127a Makes Poly less confused about the engine (#15469)
* Poly Phrases

* More quote variety!
2021-07-08 23:02:17 +01:00
SabreML
5ed4c3ca83 Loadout Instruments (#15633) 2021-07-08 22:57:54 +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
hal9000PR
d85f2261e5 Fixes firing flamethrowers when you cannot fire guns (#15935)
* fixes

* code review

* code review

* Henk review 2

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-07-08 22:35:23 +01:00
Sirryan2002
a598acf159 General Bugfixes + Closing Issues (#15936)
* Prevents Species Action Icons from Duplicating

* Spelling Correction for Igniter

* Guardian Fixes

* Photocopier bugfix

* another spelling fix

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

* removes redundant item_state declaration

Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>
2021-07-08 22:33:59 +01:00
Pidgey
64a0b9e83d Bottles and cartons now smash when thrown, breaking the container and spilling the contents over whatever is hit. This includes ones made into molotov cocktails. (#15943) 2021-07-08 22:33:12 +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