Commit Graph

19655 Commits

Author SHA1 Message Date
AffectedArc07
bede78aeff Removes table prefixes 2021-07-26 17:21:24 +01:00
datlo
01dfe5c7b7 Remove freeform core quotes (#16423) 2021-07-25 15:50:40 +01:00
variableundefined
5d3e3b2424 Merge pull request #15714 from Kepplerx/Atmos-Check
Vents and Scrubbers can be placed 180 degrees on each other, with a max of 4 total each tile
2021-07-25 08:42:07 -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
ea316e7fca Merge pull request #15902 from AffectedArc07/tg-ids
"New" ID card sprites
2021-07-25 08:27:28 -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
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
hal9000PR
48ad06e033 ughhh (#16419) 2021-07-24 23:39:31 +01:00
Adrer
beca3b43b5 Prevents labels from stacking up when entering and exiting cryopods (#16417)
* Set name back to initial on exit.

* Remove unneeded change

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2021-07-24 20:36:32 +01:00
variableundefined
dc9ce6dad7 Merge pull request #16405 from AffectedArc07/removes-headcrabs
Removes headcrabs
2021-07-21 05:12:10 -04:00
dearmochi
3938f6d0ad Fix floor painters being able to paint non-floor (#16404) 2021-07-21 08:30:57 +00: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
fbda59a8f5 slime-iv (#15642) 2021-07-16 17:34:06 +01:00
S34N
3417b51c9e Maps in the HoS hardsuit (#15637)
* Added HoS locker to all maps

* removes sneaky magboots

* Update code/game/machinery/suit_storage_unit.dm

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-07-16 16:13:46 +01:00
SabreML
b67bab70c6 Adds direction signs around the station [V2] (#15486)
* Cyberiad Directional Signs

* Mochi Review

* Map edits remake

Conflict fixer didn't work :(
2021-07-15 17:56:55 +01:00
S34N
e3866fda81 Delta brig edits (#15405)
* Cells moved and added, processing added, evidence moved.

* i did an oopsie with gitignore

* Expanded Perma, added solitary, gamma, and perma maints

* fire alarms

* more fire alarms

* magi office

* Resolved issues

Fixed issues highligted by steelslayer.
Added monitors to interrogation observation, and an intercomm for that area only.
Changed inner airlock doors for non-glass on main entryance and prison wing access.

* Update code/game/area/ss13_areas.dm

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

* power cables should actually have a purpose

* forgot to map merge latest stuff innit

* merge conflict part 2

* repipes brig, decal fixes

* merge conflict part 2

* Updated area icon

Co-authored-by: Sean Williams <sw26243@my.open.ac.uk>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-07-15 16:38:59 +01:00
hal9000PR
af5ea7b4bf round two (#16371) 2021-07-15 15:51:52 +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
99d9451075 fix (#16361) 2021-07-14 12:34:54 +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
035964ceb2 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-07-13 14:25:12 +01:00
Fox McCloud
e98d81ac46 Merge pull request #15833 from McRamon/mist-shadowstep
Mist and Shadowstep icons update (second attempt)
2021-07-13 00:51:50 -04:00
Fox McCloud
78b26a4145 Merge pull request #15618 from TDSSS/ssu-nodrop-fix
SSU now reject nodrop items
2021-07-13 00:36:13 -04:00
hal9000PR
aca230bb7b fixes mech RCDing indestructible walls (#16348)
* no just no

* this is probably good
2021-07-11 23:08:25 +01: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
AffectedArc07
9ddf4ceb97 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-07-09 11:42:23 +01:00
dearmochi
52e86bd0ed Early stage viruses no longer show on medical HUD (#16307) 2021-07-09 11:39:37 +01:00
SabreML
908c4f0dd1 Jobban adjustments (#16319)
* Borer ban

* Terror Spider jobban category

* Defines
2021-07-09 11:39:01 +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
Fox McCloud
e7cf6d9f38 Merge pull request #16252 from S34NW/sm-exploit-fix
Fixes an SM exploit with ripleys.
2021-07-08 20:25:39 -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
hal9000PR
5009e9209b .g AI absorbing me (#15562) 2021-07-08 22:59:12 +01:00
Qwertytoforty
92bdb8f159 Makes gluon grenades use ice instead of permafrost (#15577)
* Makes gluon grenades use ice instead of permafrost

* Makes it only select floor turfs
2021-07-08 22:58:44 +01:00
SabreML
04c689817e Fire + Cloth = Bad things (#15635) 2021-07-08 22:57:08 +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
warior4356
b949b1adc2 Adds sec hailers and space pod keys to sec belt (#15977) 2021-07-08 22:31:06 +01:00
Dragonkiller93
027bd7f110 Mechs no longer spit out invisible air tanks. (#16075)
* Internal tank set visible, nulled.

* Update code/game/mecha/mecha_wreckage.dm

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

* Tweaks crowbar fail message.

* Removes unneeded line.

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-07-08 22:24:45 +01:00
E-MonaRhg
8719801295 Bandolier stacks (#16106) 2021-07-08 22:22:59 +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
S34N
3724eb3ef0 Refactors AI slipping machines (#16265)
* refactors AI slipping machines

* spans

* Update code/game/machinery/ai_slipper.dm

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
2021-07-08 22:16:44 +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
AffectedArc07
c56c14fda8 Merge remote-tracking branch 'ParadiseSS13/master' into tg-ids 2021-07-07 15:00:35 +01:00
Fox McCloud
f5af21b794 Merge pull request #16213 from AffectedArc07/nukes-awful-code
Removes some oldcode
2021-07-07 09:57:16 -04:00