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
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
raspy-on-osu
9b56991f77
init
2020-09-02 17:54:35 -04:00
Ghommie
a455092c1f
aaaa
2020-09-02 19:27:04 +02:00
Ghommie
dc9b024fae
Blemishes begone.
2020-09-02 19:16:16 +02:00
Artur
a2d34b7524
Undoes Theme shit
2020-09-02 19:44:19 +03:00
Artur
d47a670f84
Cant put these on objects..
2020-09-02 19:10:35 +03:00
Artur
8d073bbce6
Merge remote-tracking branch 'upstream/master' into TGUI_Updoot
2020-09-02 19:05:18 +03:00
Artur
872e22c4b7
travis
2020-09-02 19:05:08 +03:00
Artur
c79e9fbc0b
https://github.com/tgstation/tgstation/pull/53263
2020-09-02 18:48:09 +03:00
Artur
debc300563
https://github.com/tgstation/tgstation/pull/53236/
2020-09-02 18:39:00 +03:00
Artur
d59748ceaa
https://github.com/tgstation/tgstation/pull/53168/
2020-09-02 18:38:47 +03:00
Artur
542453a7f1
Fixes shidd not working
2020-09-02 18:04:36 +03:00
Artur
3bef4ba35e
TGUI updates + statpanel
2020-09-02 17:52:47 +03:00
timothyteakettle
594fd17f23
test
2020-09-02 15:34:13 +01:00
Putnam
7b8f7aafa8
okay no it's probably this.
2020-09-02 00:57:28 -07:00
The0bserver
5f5279d2ff
You wish for change... (Added instabilities.)
2020-09-02 03:15:03 -04:00
The0bserver
6b3a0c3531
A few changes, new fertilizer obtainable now.
2020-09-02 01:00:49 -04:00
GrayRachnid
a7a8bb7992
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into revert-8235-defib-notouch
2020-09-01 23:57:06 -04: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
Putnam
b7a7170f7c
Actually I ain't using it so it goes away.
2020-09-01 15:32:22 -07:00
The0bserver
5869ddb1cd
Real Fix, Real Fox (I hope.)
2020-09-01 06:55:15 -04:00
The0bserver
7d2d7f84dd
a fix for a fox.
2020-09-01 06:49:05 -04:00
The0bserver
6673779ca2
Hi. Someone needs to fix up circuits. Not me tho.
2020-09-01 06:46:31 -04:00
The0bserver
457cb5e238
THIS IS IT LUIGI! ALL REAGENTS SET!
2020-09-01 06:44:46 -04:00
lolman360
5697ab2ff4
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
2020-09-01 16:57:02 +10:00
The0bserver
82ffb64268
maybe?
2020-09-01 02:53:29 -04:00
The0bserver
a89d6cd125
I hate circuits. They hate change.
2020-09-01 02:47:05 -04:00
The0bserver
e36f93baeb
Sorry, Circuits. (Only slightly.)
2020-09-01 02:42:43 -04:00
The0bserver
89b837461e
This should squash the error.
2020-09-01 02:32:28 -04:00
The0bserver
75854915ee
You open the door. There's a green bean.
2020-09-01 02:27:15 -04:00
The0bserver
2c6cfd2115
YOU CAN'T STOP ME FROM DREAMING!
2020-09-01 02:19:37 -04:00
silicons
aee7974140
Update astral.dm
2020-08-31 22:34:19 -07:00
The0bserver
d504d45839
Cat Roomba... (Further solidification of instab)
2020-09-01 01:27:22 -04: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
Putnam
735809a69b
Commented out threaded FFI.
2020-08-31 20:11:52 -07:00
Putnam
2f3edb4491
Added threaded extools logging as an alternative to rust_g logging.
2020-08-31 19:56:49 -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
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