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 |
|
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
|
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
|
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 |
|
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
|
dc9b024fae
|
Blemishes begone.
|
2020-09-02 19:16:16 +02: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
|
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 |
|
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 |
|
silicons
|
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
|
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 |
|
Putnam
|
e97ef2d84d
|
Added a character saving unit test.
|
2020-08-29 22:58:04 -07:00 |
|
raspy-on-osu
|
c90c46a2d1
|
mob_spawners
|
2020-08-30 01:50:55 -04:00 |
|
silicons
|
bf27de1aec
|
Merge pull request #13292 from Putnam3145/fix-dynamic-again
Rolling dynamic tweaks 'til it works
|
2020-08-29 21:41:06 -07:00 |
|
silicons
|
d4bc6f9fee
|
Merge pull request #13298 from DeltaFire15/eminence-updates
Modifies the Eminence teleport-to abilties a bit
|
2020-08-29 21:40:22 -07:00 |
|
silicons
|
bf678a25da
|
Merge pull request #13024 from zeroisthebiggay/saltprfuckwaffles
The PR That Comments Out Waffleco From Appearing AKA Fuck The Traitors ERPing Every Single Round
|
2020-08-29 21:35:58 -07:00 |
|
Tupinambis
|
39eac62dcd
|
moves growth pills and genital autosurgeons to the kinkmate
|
2020-08-29 23:35:35 -05:00 |
|
silicons
|
9250a6d71d
|
Merge pull request #13275 from Chiirno/portable-chem-mixer
Portable chem mixer
|
2020-08-29 21:34:57 -07:00 |
|
silicons
|
16fec8831a
|
Merge pull request #13230 from Detective-Google/reskin-obj
reskin_obj is now a radial
|
2020-08-29 21:33:28 -07:00 |
|
silicons
|
5f40c2da37
|
Merge pull request #13229 from Sonic121x/patch-2
Fix Tea and give them a glass sprite
|
2020-08-29 21:33:21 -07:00 |
|
silicons
|
413ccdba96
|
Merge pull request #13192 from Putnam3145/literal-hugbox
Buffs/hugboxes slaughter demons
|
2020-08-29 21:32:58 -07:00 |
|
silicons
|
033feebcd0
|
Merge pull request #12957 from kappa-sama/patch-34
removes malf disk from tendril loot
|
2020-08-29 21:31:24 -07:00 |
|
silicons
|
50cf863501
|
Merge pull request #13263 from raspy-on-osu/tesla-groundingrodspull
Tesla Counterplay.
|
2020-08-29 21:24:41 -07:00 |
|
silicons
|
4a3b6054d3
|
Merge pull request #13266 from Ghommie/Ghommie-cit836
Fixing some mistakes with the priority overlays removal PR.
|
2020-08-29 21:22:44 -07:00 |
|
silicons
|
84734591ed
|
Merge pull request #13268 from timothyteakettle/accents
separates tongues speech handling into accent datums
|
2020-08-29 21:22:11 -07:00 |
|
silicons
|
78b8072d13
|
Merge pull request #13272 from Detective-Google/patch-1
plasmamen are playable now
|
2020-08-29 21:21:23 -07:00 |
|
silicons
|
7ad037ee53
|
Merge pull request #13276 from timothyteakettle/emotes
every emote is unrestricted
|
2020-08-29 21:21:01 -07:00 |
|