Commit Graph

3396 Commits

Author SHA1 Message Date
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
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
SteelSlayer
fbda59a8f5 slime-iv (#15642) 2021-07-16 17:34:06 +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
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
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
40ab95bbaf Merge pull request #15778 from Sirryan2002/Despookify
Prevents Ghosts from circumventing boo spell cooldown
2021-07-13 00:34:47 -04: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
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
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
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
Sirryan2002
b6f334f92f applys correct fix 2021-07-04 23:44:44 -04:00
AffectedArc07
4fa871136f Sabre suggestion + Runtime fix 2021-07-02 17:24:14 +01:00
AffectedArc07
38fdfa5813 Refactor honksquads 2021-07-02 16:55:53 +01:00
Fox McCloud
d9d09deb00 Merge pull request #16212 from AffectedArc07/atom-rotation
Better atom rotation
2021-07-01 22:15:58 -04:00
AffectedArc07
691a2a278b Lets do this 2021-07-01 23:16:05 +01:00
AffectedArc07
e1647d0e36 Unit tests! 2021-07-01 22:47:06 +01:00
hal9000PR
dd9278ae98 bomb (#16273) 2021-06-30 22:47:01 +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
S34N
c1d19836e1 Adds warning to gluttony morph about not being an antag (#16148)
* chat message about not being an antag

* melts the snowflake

* forgot to do this

* Update code/datums/diseases/transformation.dm
2021-06-29 11:45:35 +01:00
warior4356
aec95fed48 Merge branch 'master' into holy-chapel 2021-06-28 20:31:34 -07: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
AffectedArc07
9b86a42a3d Casing 2021-06-24 17:29:18 +01:00
AffectedArc07
ed11899f11 Merge branch 'master' into toml-config 2021-06-23 08:44:32 +00:00
S34N
6b06ca3ef5 Ports HTML manifest to TGUI (#16210)
* Ghost manifest is tgui now

* moved to tgui modules

* Delete crew_manifest.dm

* global

* ghost -> nologo

* sorry mr. tgui, i forgot about you again

* Jade review + more trimming

* lobby and silicons get some love

* bye bye, all traces of old manifest.

* renamed
2021-06-21 12:21:32 +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
shmabuu
d6e71523b1 No more CQC discount (#15920) 2021-06-17 10:41:39 +01:00
Cocacolagua
268f1cf833 jumpboots use the correct icon (#16181) 2021-06-15 12:56:23 +01:00
AffectedArc07
efed543f47 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-06-13 14:15:07 +01:00
AffectedArc07
def7a4ef52 Steel tweaks 2021-06-09 13:14:11 +01:00
S34N
265053f966 makes sol trader IDs properly update (#16137) 2021-06-08 15:05:00 +01:00
Sirryan2002
f451b84c07 Merge branch 'ParadiseSS13:master' into Despookify 2021-06-04 12:37:03 -04:00
AffectedArc07
f3c314f07b Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-06-03 18:10:19 +01:00
Leanfrog
f68220879d Adds A Nitrile Glove Crate To Cargo (#16011)
* glove crate blue

* 4 gloves over 3 as per Fox's request
2021-05-29 21:19:53 +01:00
SabreML
cd7017e1b3 Allows Maintenance Drones to see wire names (#16047)
* drone buff

* V2 (Item Trait)

* Indentation

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-05-29 21:19:05 +01:00
AffectedArc07
8fdf5960e4 DNM - Ref finder improvements 2021-05-25 11:00:13 +01:00
SabreML
4960f5440c Various Tweaks & Fixes (#15857)
* Stuff

* Grammar reviewer review

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

* Shuttle call HTML fix

And multiline announcements too, à la #15645.

The clean_input() was causing the message to be encoded twice, and only decoded once. Removing it still encodes the string.

* Loadout revert

Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>
2021-05-24 16:29:07 +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
968d1bc88d Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-05-24 15:30:20 +01:00
AffectedArc07
7486d026b7 READY 2021-05-23 17:26:17 +01:00
S34N
365fc87dbf Fixes a bug with solgov beret sprite (#16040)
* fix 1

* also catches a bug with TSF rep sechud icons
2021-05-17 12:51:15 +01:00
AffectedArc07
8dd5dfbf7f URL configuration 2021-05-16 21:14:10 +01:00