Commit Graph

1380 Commits

Author SHA1 Message Date
silicons
0393ffe0c3 Merge pull request #13489 from timothyteakettle/species-color-define
standardizes minimum brightness of mutant parts
2020-10-03 14:21:20 -07:00
Detective Google
57132d0b32 Merge remote-tracking branch 'upstream/master' into clothing 2020-10-01 14:06:21 -05:00
Timothy Teakettle
e1123ad7fe color define 2020-10-01 18:55:32 +01:00
silicons
c8d6f3d22a Merge pull request #13477 from LetterN/patch-2
Adds craftable railings
2020-10-01 03:13:51 -07:00
silicons
38c25bdc9d Merge pull request #13466 from Putnam3145/sdgf-fix
Cleans up and fixes SDGF code a bit, consistent naked clones, transfer_ckey resets view range
2020-10-01 03:07:08 -07:00
silicons
8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
Letter N
c7875f2792 commit 3 2020-10-01 12:54:49 +08:00
Detective Google
c4480afc09 Adds a bunch of RP clothes and ports the detvendor 2020-09-30 20:50:00 -05:00
Putnam
8a01b949bf Cleaned up SDGF and consistencised clones. 2020-09-29 03:47:09 -07:00
silicons
00ab73d0a3 Merge pull request #13286 from timothyteakettle/heterochromia
heterochromia: you can select individual eye colours
2020-09-27 00:01:00 -07:00
SiliconMain
84f240c5dd Update holosign.dm 2020-09-25 09:50:08 -05:00
Timothy Teakettle
106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
Trilbyspaceclone
9c8f3305bb Merge branch 'master' into spike-loot-differentces 2020-08-30 00:41:42 -04:00
Letter N
ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00
Letter N
116145872f commit thing, need to see changies but gitlens is denying me 2020-08-29 14:00:46 +08:00
Timothy Teakettle
1d943a34ef heterochromia 2020-08-28 18:30:28 +01:00
Trilbyspaceclone
c4885d81f3 Merge branch 'master' into spike-loot-differentces 2020-08-27 03:41:14 -04:00
silicons
8699ce2174 fixes a bunch of broken clickdelays (#13218)
* fixes

* fix
2020-08-25 20:58:20 +02:00
silicons
2fa023346a Merge pull request #13204 from timothyteakettle/donator-items
adds three t1 donator items
2020-08-23 05:08:50 -07:00
Letter N
afe32406c0 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-22 13:40:36 +08:00
Letter N
f04918bdca working code? 2020-08-21 15:09:49 +08:00
silicons
120bcfc00c Merge pull request #13178 from lolman360/plumb
[READY] ports plumbing (no more waiting for tgui4)
2020-08-20 21:32:26 -07:00
Timothy Teakettle
6392367df4 donator items 2020-08-18 17:28:09 +01:00
silicons
f611945b34 Merge pull request #13180 from Detective-Google/glass-floors
ports multiz glass floors (tgstation/tgstation#50831)
2020-08-17 03:14:15 -07:00
silicons
397cdb6c03 Merge branch '13129' 2020-08-16 18:45:35 -07:00
Lin
d287f44d9a Merge pull request #13045 from silicons/coggers
ports bronze (fake clockwork) airlocks and windows
2020-08-16 20:20:03 -05:00
Detective Google
016fd2ac3c woo yeah yeah woo 2020-08-15 23:55:52 -05:00
Trilbyspaceclone
1b61a5feb2 Merge branch 'master' into spike-loot-differentces 2020-08-12 15:10:37 -04:00
silicons
3e67fd11e8 Update chair.dm 2020-08-11 23:39:31 -07:00
lolman360
6f7badda41 Merge branch 'master' into plumb 2020-08-12 09:03:11 +10:00
ancientpower
99d73388f8 lets ghosts see the contents of closets 2020-08-11 16:40:03 -05:00
silicons
a8d61b60ef Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch
adds a cybernetic eyepatch to the syndicate uplink
2020-08-11 01:47:32 -07:00
lolman360
6ec9a3c4bd craftable plunger 2020-08-11 17:38:16 +10:00
lolman360
6c57dce54e WX 2020-08-09 23:52:21 +10:00
silicons
f20f01cc6b Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
2020-08-09 05:46:21 -07:00
Sishen
1bd30ddf41 value tweak, add forced 2h 2020-08-07 21:52:16 -06:00
silicons
d6a5442a37 fix 2020-08-06 12:00:15 -07:00
silicons
2a0f2a38a7 Fix 2020-08-05 21:42:05 -07:00
silicons
815ddd1866 oh boy 2020-08-05 21:34:26 -07:00
Sishen
ec8cd31950 funny chair loses block chance and gains active block/parry 2020-08-05 14:21:48 -06:00
Timothy Teakettle
ef53f3faea the old system isnt needed really but sure i guess 2020-08-04 11:43:15 +01:00
Trilbyspaceclone
e1e6198140 Merge branch 'master' into spike-loot-differentces 2020-08-03 10:53:08 -04:00
Trilbyspaceclone
b3fea77468 Update necropolis_tendril.dm 2020-08-03 10:45:01 -04:00
Letter N
a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08:00
Letter N
b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Lin
447a0b24bf Merge pull request #12944 from timothyteakettle/fixes-crates
fixes some crafted crates containing items
2020-07-28 22:11:30 -05:00
Lin
81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
silicons
8313485632 fix 2020-07-28 11:31:28 -07:00
Timothy Teakettle
dc14c02570 fix crates 2020-07-27 21:55:51 +01:00