Commit Graph
16840 Commits
Author SHA1 Message Date
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
SandPootandGitHub 41e2a0356a Moves pref menu stuff again (#62) 2020-09-04 15:28:59 -03: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
Enric Gabriel 486ca9a81a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-04 10:15:54 -03:00
Timothy Teakettle 4bbec8eae1 travis lets be friends 2020-09-04 12:45:23 +01: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
SandPootandGitHub 3f6733fc72 Ports tgstation/53371 (#60) 2020-09-03 16:43:42 -03:00
Enric Gabriel 05485c4b2c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-03 15:26:38 -03: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!andGitHub 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
siliconsandGitHub 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
timothyteakettle 594fd17f23 test 2020-09-02 15:34:13 +01:00
Enric Gabriel ec8c53071c removes this port as cit has their own now. 2020-09-01 13:31:55 -03:00
Enric Gabriel d04a499179 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-01 11:40:44 -03:00
lolman360 5697ab2ff4 Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 16:57:02 +10:00
siliconsandGitHub aee7974140 Update astral.dm 2020-08-31 22:34:19 -07:00
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
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
Enric Gabriel c4bb4e5873 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-31 21:23:27 -03:00
Putnam c8f947011f Makes ghost dojo hilbert hotel not easily enterable. 2020-08-31 05:43:56 -07:00
Blue Wildrose cc9648c08d Update slime.dm 2020-08-30 23:19:18 -07:00
timothyteakettle af2c7b295e ah yes 2020-08-31 02:25:54 +01:00
timothyteakettle a9ec2254ba hide your ckey 2020-08-31 01:47:49 +01:00
Enric Gabriel 2d85d5f9d7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-30 17:24:58 -03:00
siliconsandGitHub 4bfa6d0a06 Merge pull request #13294 from Putnam3145/health-event-fix
Added health exemption to a couple events that need it.
2020-08-30 13:15:10 -07:00
Putnam cba2a1645b Makes pool actually check for the reagent instead of checking for a number. 2020-08-30 06:16:21 -07:00
TrilbyspacecloneandGitHub da641c9b96 Update necropolis_chests.dm 2020-08-30 02:10:59 -04:00
Putnam 66899faa72 needs that var/ 2020-08-29 23:10:13 -07:00
Putnam 3097c790b8 Added an extra test. 2020-08-29 23:02:18 -07:00