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
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
Ghommie
a455092c1f
aaaa
2020-09-02 19:27:04 +02:00
Ghommie
dc9b024fae
Blemishes begone.
2020-09-02 19:16:16 +02:00
timothyteakettle
594fd17f23
test
2020-09-02 15:34:13 +01: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
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
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
silicons
ee0d86f201
fix
2020-08-31 14:14:53 -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
Timothy Teakettle
34393a187b
fix ipcs
2020-08-30 16:27:09 +01:00
Putnam
6028c66ceb
Fixed the combat log issue
2020-08-30 08:26:29 -07:00
Putnam
10586f3c3b
trend, trend!
2020-08-30 07:33:17 -07:00
Putnam
4cf040a11a
Makes plastitanium rapier not silently poison for pacifists.
2020-08-30 06:25:00 -07:00
Putnam
9da959795c
Made the text make sense, again.
2020-08-30 05:42:21 -07:00
Putnam
15b5b77494
Replaced all the references of fusionpower to instability in results.
2020-08-30 03:06:36 -07:00
Putnam
5ba883bfe5
Fixes fusion power text to make sense.
2020-08-30 02:53:46 -07:00
silicons
69f6927275
Update broom.dm ( #13058 )
2020-08-30 09:52:54 +02: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
a8f920f88c
Update _lists.dm
2020-08-29 22:48:26 -07:00
Putnam3145
7c5197f383
Merge pull request #13249 from Citadel-Station-13/silicons-patch-25
...
removes firedoor autoopen on touch
2020-08-29 22:34:43 -07: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
1ed712d69d
Merge pull request #13302 from necromanceranne/mecha_backstab_fix_port
...
ports #52214 from /tg/: fix for mecha backstabbing
2020-08-29 21:40:13 -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
