Commit Graph

16541 Commits

Author SHA1 Message Date
Sonic121x
bb734cc861 PillTypeAgain 2020-09-10 20:22:17 +08:00
Putnam
b8c0c77b71 Makes atmos not get stuck at very cold 2020-09-09 22:24:54 -07:00
silicons
a668251de6 Merge pull request #13353 from timothyteakettle/accent-tidyup
further accent modifications because holy shit
2020-09-08 10:31:45 -07:00
silicons
809d6b212c Merge pull request #13344 from Putnam3145/fix-monstermos-superconduct
Makes heat conduction work for the first time ever
2020-09-08 01:58:19 -07:00
BlackMajor
3ce2661cfc Merge pull request #13354 from Citadel-Station-13/silicons-patch-33
meteors are a static 5 minute instead of random 3-6 minutes
2020-09-08 12:05:51 +12:00
BlackMajor
ac346a7cc9 Merge pull request #13350 from Citadel-Station-13/silicons-patch-32
fixes reagent containers doubleattacking
2020-09-08 12:05:29 +12:00
BlackMajor
1f96766699 Merge pull request #13273 from Citadel-Station-13/silicons-patch-2
slightly more intuitive eyebeam clamping
2020-09-08 12:05:10 +12:00
silicons
419eb5ae05 Merge pull request #13360 from KeRSedChaplain/silicon_death_sounds
Silicon death sounds or "Cease shooting the malfunctioning metal doorknob at the tone"
2020-09-07 13:42:31 -07:00
silicons
07b28f40de Merge pull request #13359 from Ghommie/Ghommie-cit838
Turf visuals fix plus corrected names of a couple things.
2020-09-07 13:42:05 -07:00
silicons
45ee1cbbf8 Merge pull request #13334 from CameronWoof/revert-12739-DRAKEBORG
Revert Drakeborgs
2020-09-06 15:22:16 -07:00
Dan-Neposh
db67e6db1f AIs have their own unique sound for death now 2020-09-06 18:02:30 -04:00
Dan-Neposh
f4ae266d66 Silicons now have a sound to let you know when your flash spam succeeds 2020-09-06 17:21:52 -04:00
Timothy Teakettle
98a7332e23 is this really the root of the issue 2020-09-06 21:02:24 +01:00
DeltaFire15
cf61133476 typofix (#13358) 2020-09-06 20:43:19 +02:00
Timothy Teakettle
8fe55e1317 travis what the fuck 2020-09-06 19:16:30 +01:00
Timothy Teakettle
d51fb00ebf makes more sense this way 2020-09-06 18:57:17 +01:00
Timothy Teakettle
5f5455add1 yes 2020-09-06 18:48:59 +01:00
Ghommie
4a04b22b72 Turf visuals fix plus corrected names of a couple things. 2020-09-06 18:53:01 +02:00
silicons
9e204f167f Merge pull request #12452 from Trilbyspaceclone/spike-loot-differentces
Miner Loot Shuffle MK III
2020-09-06 01:58:46 -07:00
Letter N
fd2ec66757 Ports "Fix bicon(icon2html) showing full dmis, fix asset cache hashes being incorrect." (#13347) 2020-09-06 09:23:28 +02:00
BlackMajor
8b59b4a80d Merge pull request #13332 from Citadel-Station-13/silicons-patch-31
makes magweapons emp-immune
2020-09-06 18:05:34 +12:00
BlackMajor
75e38edb43 Merge pull request #13287 from Citadel-Station-13/revert-13122-haha
Reverts load delays because it's still a problem and by god am I just done at this point
2020-09-06 18:01:09 +12:00
BlackMajor
1943a2fdd7 Merge pull request #13246 from silicons/anomaly_manufacturing
anomaly manufacturing port from tg. supermatter anomaly generation nerfed to 20% rather than removed
2020-09-06 17:53:35 +12:00
BlackMajor
fb531e88d8 Merge pull request #13073 from Citadel-Station-13/silicons-patch-84
you can no longer attack people with surgical tools if you are in help intent
2020-09-06 17:49:35 +12:00
silicons
de8067761a Update meteor_wave.dm 2020-09-05 13:12:45 -07:00
silicons
4b9b68f398 Merge pull request #13311 from Putnam3145/fix-pool-reagents
Makes pool actually check for reagents
2020-09-05 13:11:39 -07:00
Timothy Teakettle
de640254c7 tidyup 2020-09-05 20:32:22 +01: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
c690e59085 change accent names 2020-09-05 16:26:55 +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
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
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
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
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