Commit Graph

3414 Commits

Author SHA1 Message Date
E-MonaRhg
c652bbfa10 Initial departmental clothing vendors commit 2021-08-05 22:01:05 +02:00
AffectedArc07
e46f67810a Cleans up the TODOs I left all over the codebase (#16443)
* Removes command_name() proc

* Removes GLOB.teleportlocs + GLOB.ghostteleportlocs

* Clean up IPIntel

* Tweaks karma logging

* Tweaks time
2021-07-28 13:45:18 -04:00
dearmochi
c95f566cd1 Custom emotes display on runechat (#16355)
* Custom emotes display on runechat

* document symbol arg

* Update code/__DEFINES/misc.dm
2021-07-28 10:06:43 +01:00
Fox McCloud
cfde082a10 Merge pull request #15807 from hal9000PR/TG-carp-2-electric-boogaloo
Ports TG sleeping carp, the second.
2021-07-27 13:21:41 -04:00
AffectedArc07
fad93ed2e4 Revert "uh oh that guy is glowing green (#16435)"
This reverts commit 076e807731.
2021-07-27 12:54:33 +01:00
S34N
076e807731 uh oh that guy is glowing green (#16435) 2021-07-27 10:46:26 +01:00
variableundefined
7912fae83b Merge pull request #15354 from Qwertytoforty/My-turn-to-try
Adds a heal point system to the rod of Asclupius
2021-07-26 13:57:28 -04:00
Qwertytoforty
076cbba3c4 Aaaand extra brackets I forgot 2021-07-26 13:51:57 -04:00
Qwertytoforty
2eb5e26aba Final changes 2021-07-26 13:50:33 -04:00
Qwertytoforty
2523dc90bc Update code/datums/status_effects/buffs.dm
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-07-26 13:47:06 -04: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
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