Commit Graph

18009 Commits

Author SHA1 Message Date
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
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
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
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 3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
timothyteakettle 594fd17f23 test 2020-09-02 15:34:13 +01: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
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 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
Hatterhat b1b92c3225 runtiment 2020-08-31 14:12:10 -05:00
Putnam c8f947011f Makes ghost dojo hilbert hotel not easily enterable. 2020-08-31 05:43:56 -07:00
The0bserver df3c2d3d8d Reduced some bloat, using TRAY_NAME_UPDATE 2020-08-31 05:01:51 -04:00
The0bserver b13db43985 Let's not forget this. 2020-08-31 03:27:56 -04:00
The0bserver dbb6ef7d4e I think we got rid of nutrilevel, finally. 2020-08-31 03:26:43 -04:00
Blue Wildrose cc9648c08d Update slime.dm 2020-08-30 23:19:18 -07:00
The0bserver 4edf61dde7 New Define File: Botany.dm Earthmother save me. 2020-08-31 00:34:45 -04:00
Letter N ceea4f07ea tested? no 2020-08-31 10:43:03 +08:00
Hatterhat 0db189333a >one fucking callback 2020-08-30 21:21:27 -05:00