Commit Graph

24848 Commits

Author SHA1 Message Date
silicons 6e6ca622e6 Merge pull request #13279 from Hatterhat/the-desword-block-buff
alternate to 13728 - 60% rngblock, activeblock covers sides, effectiveness against projectiles upped
2020-09-05 13:10:50 -07:00
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 f9bb245acc DONT MAKE THE SAME MISTAKE 2020-09-05 16:32:41 +01:00
Timothy Teakettle c690e59085 change accent names 2020-09-05 16:26:55 +01:00
Timothy Teakettle 93501e2d3d sorry ipcs 2020-09-05 16:24:58 +01: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 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
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
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
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
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
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
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
raspy-on-osu b186f8ac05 init 2020-09-02 20:26:43 -04: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 7b8f7aafa8 okay no it's probably this. 2020-09-02 00:57:28 -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
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
lolman360 5697ab2ff4 Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 16:57:02 +10:00
silicons aee7974140 Update astral.dm 2020-08-31 22:34:19 -07:00
silicons 10fdc4427a Merge pull request #13305 from Tupinambis/maintloot2
Removes growth pills and genital autosurgeons from the maint loot table. Shoves them in the kinkmates.
2020-08-31 21:21:46 -07:00
silicons 9a4f9aef6e Merge pull request #13307 from raspy-on-osu/pyroanomaly-slimespawn-spam
pyro anomaly spam salt pr (offer_control now supports ignore_category)
2020-08-31 21:21:09 -07:00
silicons 0dc96492a1 Merge pull request #13308 from Putnam3145/save_character_unit_test
Adds a character saving unit test
2020-08-31 21:20:48 -07:00
silicons db28a50953 Merge pull request #13310 from Putnam3145/fix-fusion-display
Makes fusion analyze not assume we're still on fusion v5
2020-08-31 21:20:15 -07:00
silicons 77cf561f7f Merge pull request #13316 from timothyteakettle/ckey-pref
pref for hiding your ckey from roundend report
2020-08-31 21:19:37 -07:00
silicons 1670b6f2a6 Merge pull request #13313 from Putnam3145/plastitanium-rapier-fix
Makes plastitanium rapier not silently poison for pacifists.
2020-08-31 21:19:09 -07:00
Putnam 735809a69b Commented out threaded FFI. 2020-08-31 20:11:52 -07:00
Putnam 2f3edb4491 Added threaded extools logging as an alternative to rust_g logging. 2020-08-31 19:56:49 -07:00
lolman360 1b52ceb63a Various changes. 2020-09-01 11:43:01 +10:00
lolman360 05bd0579ca Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 11:23:57 +10:00
lolman360 4d6fb10dff Nyoops. 2020-09-01 10:55:55 +10:00
lolman360 400391e8d8 Bronze anvil tweaks, clarity. 2020-09-01 10:37:56 +10:00
silicons 4936829bac Merge pull request #13319 from BlueWildrose/hungryhungryslimes
Fixed newly created slimes being hungry
2020-08-31 16:59:58 -07:00
Timothy Teakettle d859d12b9f yes 2020-09-01 00:14:17 +01:00