Commit Graph

26370 Commits

Author SHA1 Message Date
Putnam3145 62fae3515a Merge pull request #13326 from Citadel-Station-13/silicons-patch-29
radioactive ghosts redux
2020-09-04 18:07:34 -07:00
Putnam 288104a22b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into fix-monstermos-superconduct 2020-09-04 17:26:40 -07:00
silicons dba1f6af23 Merge pull request #13321 from Putnam3145/fix-ghost-dorm
Makes ghost dojo hilbert hotel's numbers less trivially deducible.
2020-09-04 12:56:50 -07:00
silicons 14ebeddea2 Merge pull request #13304 from GrayRachnid/revert-8235-defib-notouch
Revert "Buffs defib users by making them stop pulling automatically"
2020-09-04 12:56:13 -07:00
silicons 80633fbc3c Merge pull request #13336 from Putnam3145/fix-threat-removal
Fixes threat adjustment in the game panel not to always go up.
2020-09-04 12:55:32 -07:00
silicons 23a09aa3a3 Merge pull request #13335 from deathride58/propertempnotif
Adds shivering/sweating notifications (in devman terms: readds the old temperature notifications)
2020-09-04 12:55:16 -07:00
silicons 46439eac04 Merge pull request #13333 from raspy-on-osu/smshard-examine-dialog
adds anchored state/anchoring tip to supermatter shard examine text
2020-09-04 12:54:59 -07:00
silicons bd53b17e52 Merge pull request #13331 from raspy-on-osu/atmos-holofanstotools
moves engineering projectors to the "tool designs" protolathe category
2020-09-04 12:54:44 -07:00
Putnam febd4a47c1 I can probably afford to have these higher, really. 2020-09-04 08:23:53 -07:00
Putnam d6ee54c77d Makes superconducting work for the first time ever. 2020-09-04 08:22:54 -07:00
Timothy Teakettle 4bbec8eae1 travis lets be friends 2020-09-04 12:45:23 +01:00
silicons 12c5680d58 Merge pull request #13324 from Putnam3145/extools-logging
Added threaded extools logging as an alternative to rust_g logging.
2020-09-04 04:10:02 -07:00
Artur 3fb72e0fea Merge remote-tracking branch 'upstream/master' into TGUI_Updoot 2020-09-04 11:43:31 +03:00
Putnam bb9374a3f0 Significantly reduced chance of severe trauma, too. 2020-09-03 18:15:58 -07:00
Putnam c48dd86e6e Makes brain trauma not roll lobotomy-resist and only happen when there's doctors. 2020-09-03 18:03:11 -07:00
Putnam 4ef4220c88 Completely decouples events from dynamic. 2020-09-03 16:38:16 -07:00
Putnam 6fe345dc2c Makes the character save test more verbose when failing. 2020-09-03 15:44:43 -07:00
timothyteakettle cdaef63fa1 sorry travis 2020-09-03 23:07:19 +01:00
timothyteakettle fc0e8e31fc yeah dont brick data again holy shit 2020-09-03 22:51:56 +01:00
timothyteakettle 90eef6efc9 Merge remote-tracking branch 'upstream/master' into limbs 2020-09-03 22:46:32 +01:00
timothyteakettle 798e11c407 logic 2020-09-03 22:36:38 +01:00
timothyteakettle 4f82f063db dummies 2020-09-03 22:09:50 +01:00
timothyteakettle 9e2ee588c9 rp prosthetics 2020-09-03 22:05:21 +01:00
Putnam 7dea04dca4 Wow, turns out negative*negative = positive, WHO KNEW. 2020-09-03 04:38:41 -07:00
deathride58 1c9a22fa5e Readds the old temperature notification method in the form of a shivering/sweating notification 2020-09-03 01:35:28 -04:00
Putnam3145 bce53f71ce Merge pull request #13322 from timothyteakettle/fix-accents
makes handle_speech in ipc accent actually return the speech args so ipcs can talk
2020-09-02 17:56:40 -07:00
Cameron! e3af0d654e Revert "[READY] DRAKEBORGS & PLUSHIES" 2020-09-02 17:47:22 -07:00
raspy-on-osu b186f8ac05 init 2020-09-02 20:26:43 -04:00
silicons cbcacaa0af Update magweapon.dm 2020-09-02 15:51:28 -07:00
raspy-on-osu 9b56991f77 init 2020-09-02 17:54:35 -04:00
Ghommie a455092c1f aaaa 2020-09-02 19:27:04 +02:00
Ghommie dc9b024fae Blemishes begone. 2020-09-02 19:16:16 +02:00
Artur a2d34b7524 Undoes Theme shit 2020-09-02 19:44:19 +03:00
Artur d47a670f84 Cant put these on objects.. 2020-09-02 19:10:35 +03:00
Artur 8d073bbce6 Merge remote-tracking branch 'upstream/master' into TGUI_Updoot 2020-09-02 19:05:18 +03:00
Artur 872e22c4b7 travis 2020-09-02 19:05:08 +03:00
Artur c79e9fbc0b https://github.com/tgstation/tgstation/pull/53263 2020-09-02 18:48:09 +03:00
Artur debc300563 https://github.com/tgstation/tgstation/pull/53236/ 2020-09-02 18:39:00 +03:00
Artur d59748ceaa https://github.com/tgstation/tgstation/pull/53168/ 2020-09-02 18:38:47 +03:00
Artur 542453a7f1 Fixes shidd not working 2020-09-02 18:04:36 +03:00
Artur 3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
timothyteakettle 594fd17f23 test 2020-09-02 15:34:13 +01:00
Putnam 7b8f7aafa8 okay no it's probably this. 2020-09-02 00:57:28 -07:00
The0bserver 5f5279d2ff You wish for change... (Added instabilities.) 2020-09-02 03:15:03 -04:00
The0bserver 6b3a0c3531 A few changes, new fertilizer obtainable now. 2020-09-02 01:00:49 -04:00
GrayRachnid a7a8bb7992 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into revert-8235-defib-notouch 2020-09-01 23:57:06 -04:00
Putnam3145 c0b73f8d6a Merge pull request #13306 from Citadel-Station-13/silicons-patch-28
new codebase policy do not use potentially volatile procs in character setup of all places so we can stop having the moments when everyone's characters get bricked for the 619634'th time.
2020-09-01 15:37:34 -07:00
Putnam b7a7170f7c Actually I ain't using it so it goes away. 2020-09-01 15:32:22 -07:00
The0bserver 5869ddb1cd Real Fix, Real Fox (I hope.) 2020-09-01 06:55:15 -04:00
The0bserver 7d2d7f84dd a fix for a fox. 2020-09-01 06:49:05 -04:00