Commit Graph

37724 Commits

Author SHA1 Message Date
silicons 6527e2e9ea Merge pull request #13348 from raspy-on-osu/thermomachine-why
Thermomachine boards (Freezer/Heater) now tell you how to change their pipe layer
2020-09-05 02:16:18 -07:00
silicons e110945568 Merge pull request #13289 from kiwedespars/heretics-touchup
heretics touchup
2020-09-05 02:15:21 -07:00
CitadelStationBot 545212520f Automatic changelog generation for PR #13339 [ci skip] 2020-09-05 04:12:04 -05: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
CitadelStationBot c0917de446 Automatic changelog generation for PR #13341 [ci skip] 2020-09-05 04:11:43 -05: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
raspy-on-osu 4c8983f006 init 2020-09-04 22:13:56 -04: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
Changelogs d0ed677320 Automatic changelog compile [ci skip] 2020-09-05 00:19:41 +00:00
CitadelStationBot 96e72f764f Automatic changelog generation for PR #13321 [ci skip] 2020-09-04 14:56:53 -05: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
CitadelStationBot cda9f34639 Automatic changelog generation for PR #13337 [ci skip] 2020-09-04 14:55:47 -05:00
silicons c7b3cfab4a Merge pull request #13337 from Putnam3145/compress-owo
Compresses owo.ogg
2020-09-04 12:55:44 -07:00
CitadelStationBot c53b511c41 Automatic changelog generation for PR #13336 [ci skip] 2020-09-04 14:55:36 -05: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
CitadelStationBot 4cfdaf2270 Automatic changelog generation for PR #13335 [ci skip] 2020-09-04 14:55:24 -05: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
CitadelStationBot 733261dab4 Automatic changelog generation for PR #13333 [ci skip] 2020-09-04 14:55:02 -05: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
CitadelStationBot 644a42c7a2 Automatic changelog generation for PR #13331 [ci skip] 2020-09-04 14:54:47 -05: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
CitadelStationBot 8d7aaa5045 Automatic changelog generation for PR #13324 [ci skip] 2020-09-04 06:10:06 -05: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
CitadelStationBot 86a845718d Automatic changelog generation for PR #13338 [ci skip] 2020-09-04 06:09:28 -05:00
silicons 3806bd5c71 Merge pull request #13338 from Putnam3145/saving-test-update
Makes the character save test more verbose when failing.
2020-09-04 04:09:25 -07: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
Changelogs f41c95a6a4 Automatic changelog compile [ci skip] 2020-09-04 00:13:57 +00: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
Putnam 8e903f8643 Compresses owo.ogg 2020-09-03 06:15:34 -07: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
CitadelStationBot da003edc4a Automatic changelog generation for PR #13322 [ci skip] 2020-09-02 19:56:44 -05: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
Putnam3145 fd6bda366f Merge pull request #13325 from Citadel-Station-13/revert-13184-two-joke-sprites
Revert "removes two unused sprites"
2020-09-02 17:33:08 -07:00
raspy-on-osu b186f8ac05 init 2020-09-02 20:26:43 -04:00
Changelogs bc974047a3 Automatic changelog compile [ci skip] 2020-09-03 00:14:00 +00:00
CitadelStationBot 1fcf738a6b Automatic changelog generation for PR #13330 [ci skip] 2020-09-02 17:56:58 -05:00
silicons bce78a4e55 Merge pull request #13330 from Ghommie/Ghommie-cit837
Banishing a few blemishes.
2020-09-02 15:56:54 -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
Putnam d0a0b30665 guess who forgot travis runs on linux 2020-09-02 01:11:42 -07:00
Putnam 7b8f7aafa8 okay no it's probably this. 2020-09-02 00:57:28 -07:00
Putnam 92ea60a03e Probably actually fixed it. 2020-09-02 00:49:30 -07: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
Changelogs 6f5de529c1 Automatic changelog compile [ci skip] 2020-09-02 00:13:45 +00: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