Commit Graph

9205 Commits

Author SHA1 Message Date
datlo
01dfe5c7b7 Remove freeform core quotes (#16423) 2021-07-25 15:50:40 +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
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
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
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
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
SabreML
908c4f0dd1 Jobban adjustments (#16319)
* Borer ban

* Terror Spider jobban category

* Defines
2021-07-09 11:39:01 +01: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
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
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
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
warior4356
15b32b7283 Merge branch 'master' into holy-chapel 2021-07-05 18:12:02 -07:00
LordShekelstein
3efc77a9e8 fixes spelling error. (#16308) 2021-07-05 18:27:53 +01:00
LordShekelstein
f4e07cd148 Fixes a glaring grammatical error in the matter bin's description. (#16299)
* How did this get past S34N?

* Round 2, cleanup
2021-07-04 11:42:54 +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
Qwertytoforty
15b7a76c91 Fixes syndicate teleporter saving throw bug (#16287) 2021-07-02 19:39:58 +01:00
Qwertytoforty
7413256cb8 Prevents ghosts from setting off mousetraps (#16274)
* Prevents ghosts from setting off mousetraps

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

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

* Note to self: Do not be tired when commiting suggestions

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

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
2021-07-02 16:20:12 +01:00
datlo
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
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
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
warior4356
aec95fed48 Merge branch 'master' into holy-chapel 2021-06-28 20:31:34 -07:00
SabreML
c266b27aed Another small bugfix bundle (#16260)
* Closet examine

* Lit welder inhands

* Capitalisation

* Cyber organ eating

* Nukie reinforcements code

* Welding tool lathe cost

* Patch pack dropping

* Welding tool fix

* Spacing

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-06-26 22:57:27 +01:00
S34N
6080189ea3 Fixes powersink not giving you a beacon on purchase. (#16255)
* powersink gives you a beacon, as described

* no longer a bomb subtype

* Update code/game/objects/items/devices/radio/beacon.dm

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

* Update code/game/objects/items/devices/radio/beacon.dm

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

Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-06-26 21:34:08 +01:00
S34N
672f900b40 fixes RPD eating TEG circulators (#16258) 2021-06-26 14:36:40 +01:00
SteelSlayer
eb5fa5080c Update robot_upgrades.dm (#16248) 2021-06-25 18:48:04 +01:00
hal9000PR
e4d1788088 Fixes singulo hammer sucking in ghosts (#16247)
* fix

* review
2021-06-24 20:02:32 +01:00
AffectedArc07
ed11899f11 Merge branch 'master' into toml-config 2021-06-23 08:44:32 +00:00
dearmochi
b1fe555a79 Fix shower mist not going away on deconstruction (#16233)
Co-authored-by: dearmochi <>
2021-06-22 21:05:14 +01:00
Akira Akashi
f1ad48c450 remove \the from loom.dm (#16222) 2021-06-21 10:42:20 +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
hal9000PR
fc3185dcb6 fix (#16209) 2021-06-19 23:07:50 +01:00