cdaef63fa1
sorry travis
2020-09-03 23:07:19 +01:00
fc0e8e31fc
yeah dont brick data again holy shit
2020-09-03 22:51:56 +01:00
90eef6efc9
Merge remote-tracking branch 'upstream/master' into limbs
2020-09-03 22:46:32 +01:00
798e11c407
logic
2020-09-03 22:36:38 +01:00
4f82f063db
dummies
2020-09-03 22:09:50 +01:00
9e2ee588c9
rp prosthetics
2020-09-03 22:05:21 +01:00
da003edc4a
Automatic changelog generation for PR #13322 [ci skip]
2020-09-02 19:56:44 -05:00
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
fd6bda366f
Merge pull request #13325 from Citadel-Station-13/revert-13184-two-joke-sprites
...
Revert "removes two unused sprites"
2020-09-02 17:33:08 -07:00
bc974047a3
Automatic changelog compile [ci skip]
2020-09-03 00:14:00 +00:00
1fcf738a6b
Automatic changelog generation for PR #13330 [ci skip]
2020-09-02 17:56:58 -05:00
bce78a4e55
Merge pull request #13330 from Ghommie/Ghommie-cit837
...
Banishing a few blemishes.
2020-09-02 15:56:54 -07:00
a455092c1f
aaaa
2020-09-02 19:27:04 +02:00
dc9b024fae
Blemishes begone.
2020-09-02 19:16:16 +02:00
594fd17f23
test
2020-09-02 15:34:13 +01:00
6f5de529c1
Automatic changelog compile [ci skip]
2020-09-02 00:13:45 +00:00
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
4f33865ce5
Automatic changelog generation for PR #13305 [ci skip]
2020-08-31 23:21:49 -05:00
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
e4c758e92e
Automatic changelog generation for PR #13307 [ci skip]
2020-08-31 23:21:12 -05:00
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
ed791312d6
Automatic changelog generation for PR #13308 [ci skip]
2020-08-31 23:20:52 -05:00
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
5ffa571e67
Automatic changelog generation for PR #13310 [ci skip]
2020-08-31 23:20:18 -05:00
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
2bb19e838b
Automatic changelog generation for PR #13316 [ci skip]
2020-08-31 23:19:40 -05:00
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
81645301e1
Automatic changelog generation for PR #13313 [ci skip]
2020-08-31 23:19:12 -05:00
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
6348dd7d13
Revert "removes two unused sprites"
2020-08-31 21:06:18 -07:00
e652591639
Automatic changelog compile [ci skip]
2020-09-01 00:16:02 +00:00
515e0333fc
Automatic changelog generation for PR #13319 [ci skip]
2020-08-31 19:00:01 -05:00
4936829bac
Merge pull request #13319 from BlueWildrose/hungryhungryslimes
...
Fixed newly created slimes being hungry
2020-08-31 16:59:58 -07:00
5bcae6431b
Merge pull request #13323 from silicons/rsc
...
Fixes external_rsc_urls so we can finally get rid of (about 50% of) this godawful lag
2020-08-31 16:21:32 -07:00
d859d12b9f
yes
2020-09-01 00:14:17 +01:00
ee0d86f201
fix
2020-08-31 14:14:53 -07:00
cc9648c08d
Update slime.dm
2020-08-30 23:19:18 -07:00
af2c7b295e
ah yes
2020-08-31 02:25:54 +01:00
a9ec2254ba
hide your ckey
2020-08-31 01:47:49 +01:00
d97d9f564b
Automatic changelog compile [ci skip]
2020-08-31 00:15:04 +00:00
55fcd95eba
Automatic changelog generation for PR #13294 [ci skip]
2020-08-30 15:15:13 -05:00
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
34393a187b
fix ipcs
2020-08-30 16:27:09 +01:00
6028c66ceb
Fixed the combat log issue
2020-08-30 08:26:29 -07:00
10586f3c3b
trend, trend!
2020-08-30 07:33:17 -07:00
4cf040a11a
Makes plastitanium rapier not silently poison for pacifists.
2020-08-30 06:25:00 -07:00
4626a9a411
Merge branch 'fix-fusion-display' of https://github.com/Putnam3145/Citadel-Station-13 into fix-fusion-display
2020-08-30 05:42:38 -07:00
9da959795c
Made the text make sense, again.
2020-08-30 05:42:21 -07:00
4d4cfd58d9
Remove bizarre changelog change.
2020-08-30 05:35:03 -07:00
15b5b77494
Replaced all the references of fusionpower to instability in results.
2020-08-30 03:06:36 -07:00
timothyteakettle