Commit Graph

19184 Commits

Author SHA1 Message Date
Putnam3145
d6127d71a8 Merge pull request #13352 from timothyteakettle/fix-accents-but-pushed-this-time
lets ipcs talk but i actually push my changes this time
2020-09-05 08:40:31 -07:00
Timothy Teakettle
c690e59085 change accent names 2020-09-05 16:26:55 +01:00
Trilbyspaceclone
917dfdd403 Update alcohol_reagents.dm 2020-09-05 10:38:32 -04:00
silicons
7b50b22c7b Merge pull request #13244 from lolman360/AnPrimAssistants
Blacksmithing 2: Anarcho-Primitivist Assistants (travis don't fail on me now)
2020-09-05 02:20:11 -07:00
silicons
e110945568 Merge pull request #13289 from kiwedespars/heretics-touchup
heretics touchup
2020-09-05 02:15:21 -07:00
silicons
a58a67f90c Merge pull request #13339 from Putnam3145/dynamic-event-decouples
Completely decouples events from dynamic.
2020-09-05 02:12:00 -07:00
silicons
0efc5bdaed Merge pull request #13341 from Putnam3145/brain-trauma-nerf
Nerfs random brain trauma a good deal.
2020-09-05 02:11:40 -07:00
silicons
7aa2a89243 Update reagent_containers.dm 2020-09-05 00:23:30 -07:00
Letter N
ff57550c9c Unit Test Update 2020-09-05 11:13:14 +08:00
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
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
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
deathride58
1c9a22fa5e Readds the old temperature notification method in the form of a shivering/sweating notification 2020-09-03 01:35:28 -04: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
dc9b024fae Blemishes begone. 2020-09-02 19:16:16 +02: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
3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
timothyteakettle
594fd17f23 test 2020-09-02 15:34:13 +01: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
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
The0bserver
6673779ca2 Hi. Someone needs to fix up circuits. Not me tho. 2020-09-01 06:46:31 -04:00
The0bserver
457cb5e238 THIS IS IT LUIGI! ALL REAGENTS SET! 2020-09-01 06:44:46 -04:00
lolman360
5697ab2ff4 Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 16:57:02 +10:00