 siliconsandGitHub
|
27ae95dd26
|
Merge pull request #13499 from Putnam3145/toilet-loot-fix
Makes toilet loot not exist to cause bad GC bugs.
|
2020-10-03 18:07:10 -07:00 |
|
|
SandPoot
|
1c14536bb5
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-10-03 18:54:30 -03:00 |
|
|
siliconsandGitHub
|
0393ffe0c3
|
Merge pull request #13489 from timothyteakettle/species-color-define
standardizes minimum brightness of mutant parts
|
2020-10-03 14:21:20 -07:00 |
|
|
Putnam
|
138794378d
|
Made holofirelocks work.
|
2020-10-02 22:34:05 -07:00 |
|
|
Putnam
|
29213bbcbe
|
ok i guess it has to be initialize
|
2020-10-02 17:39:53 -07:00 |
|
|
Putnam
|
3b21c31872
|
Makes water closet loot work and not cause bad GC bugs.
|
2020-10-02 16:56:21 -07:00 |
|
|
Enric Gabriel
|
c27b799fc6
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-10-01 21:16:19 -03: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 |
|
|
Enric Gabriel
|
7df07d2859
|
Merge branch 'master' of upstream into master
|
2020-10-01 12:49:01 -03:00 |
|
|
siliconsandGitHub
|
c8d6f3d22a
|
Merge pull request #13477 from LetterN/patch-2
Adds craftable railings
|
2020-10-01 03:13:51 -07:00 |
|
|
siliconsandGitHub
|
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 |
|
|
siliconsandGitHub
|
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 |
|
|
siliconsandGitHub
|
00ab73d0a3
|
Merge pull request #13286 from timothyteakettle/heterochromia
heterochromia: you can select individual eye colours
|
2020-09-27 00:01:00 -07:00 |
|
|
Enric Gabriel
|
76a96746f7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-26 15:58:28 -03:00 |
|
|
SiliconMainandGitHub
|
84f240c5dd
|
Update holosign.dm
|
2020-09-25 09:50:08 -05:00 |
|
|
SandPootandGitHub
|
13834c4bef
|
Morrowinventory Port (#75)
|
2020-09-24 20:14:53 -03:00 |
|
|
Timothy TeakettleandGitHub
|
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 |
|
|
Hatterhat
|
f8c1c829d7
|
maulers slam people very violently
|
2020-09-06 15:34:53 -05:00 |
|
|
Enric Gabriel
|
499fec6a16
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-09-06 10:42:43 -03:00 |
|
|
Enric Gabriel
|
c10471fac9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-30 01:42:29 -03:00 |
|
|
TrilbyspacecloneandGitHub
|
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 |
|
|
TrilbyspacecloneandGitHub
|
c4885d81f3
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-27 03:41:14 -04:00 |
|
|
Enric Gabriel
|
45c5d5d81d
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-25 16:06:57 -03:00 |
|
|
siliconsandGitHub
|
8699ce2174
|
fixes a bunch of broken clickdelays (#13218)
* fixes
* fix
|
2020-08-25 20:58:20 +02:00 |
|
|
Enric Gabriel
|
78124ace3f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-23 12:54:24 -03:00 |
|
|
siliconsandGitHub
|
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 |
|
|
Enric Gabriel
|
b0662f5e39
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-21 02:19:20 -03:00 |
|
|
siliconsandGitHub
|
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 |
|
|
Enric Gabriel
|
cf2c21ea52
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-17 12:06:32 -03:00 |
|
|
siliconsandGitHub
|
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 |
|
|
Enric Gabriel
|
06496434a4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-16 23:30:53 -03:00 |
|
|
Enric Gabriel
|
7898f1fe3e
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-16 23:24:11 -03:00 |
|
|
silicons
|
397cdb6c03
|
Merge branch '13129'
|
2020-08-16 18:45:35 -07:00 |
|
|
LinandGitHub
|
d287f44d9a
|
Merge pull request #13045 from silicons/coggers
ports bronze (fake clockwork) airlocks and windows
|
2020-08-16 20:20:03 -05:00 |
|
|
Enric Gabriel
|
da9bea69fe
|
there
|
2020-08-16 15:36:51 -03:00 |
|
|
Detective Google
|
016fd2ac3c
|
woo yeah yeah woo
|
2020-08-15 23:55:52 -05:00 |
|
|
Enric Gabriel
|
4e7312d276
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master
|
2020-08-14 15:07:53 -03:00 |
|
|
TrilbyspacecloneandGitHub
|
1b61a5feb2
|
Merge branch 'master' into spike-loot-differentces
|
2020-08-12 15:10:37 -04:00 |
|
|
siliconsandGitHub
|
3e67fd11e8
|
Update chair.dm
|
2020-08-11 23:39:31 -07:00 |
|