 Ghommie
|
8fbfd07692
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-22 00:55:32 +01:00 |
|
|
Ghom
|
8395ee53e7
|
Merge pull request #11156 from Psody-Mordheim/Plzgibsynthflesh
Virology Symptom Update : Now Featuring EVEN MORE PWRGAME
|
2020-02-21 02:47:18 +01:00 |
|
|
Ghom
|
e92183e968
|
Merge pull request #10541 from Detective-Google/the-p-o-o-l
adds the POOL to box station
|
2020-02-21 02:43:04 +01:00 |
|
|
Ghom
|
7763475b83
|
Merge pull request #10572 from Tupinambis/SiliconDefault
Removes harm prevention clause indicators from relevant sources.
|
2020-02-20 15:33:27 +01:00 |
|
|
Ghom
|
608bb0a04c
|
Merge pull request #10649 from kevinz000/hijack
Completely reworks the hijack objective, and shuttle hijacking in general
|
2020-02-20 14:40:08 +01:00 |
|
|
kevinz000
|
ca777c6c8b
|
Merge pull request #11153 from Ghommie/Ghommie-cit587
Fixing addiction moodlets not going away and secret sauce recipe paper.
|
2020-02-20 06:17:33 -07:00 |
|
|
Ghom
|
d680ab9fd5
|
Merge pull request #11025 from Arturlang/TGUI_Next_Nanites
Ports TGUI Next and a lot of misc updates for nanites.
|
2020-02-20 11:27:48 +01:00 |
|
|
kevinz000
|
2dd5a0cfb8
|
Merge branch 'master' into hijack
|
2020-02-19 22:25:31 -07:00 |
|
|
kevinz000
|
6f31e1270e
|
Merge pull request #11098 from Trilbyspaceclone/bows!
Silk into clothing, bows, arrows, quivers and more!
|
2020-02-19 19:05:49 -07:00 |
|
|
kevinz000
|
a10c71320d
|
Merge pull request #11117 from Citadel-Station-13/Ghommie-patch-1
Makes the mob holder examine less dumb, also indentation.
|
2020-02-19 19:02:34 -07:00 |
|
|
Arturlang
|
796f51b557
|
Merge branch 'master' into TGUI_Next_Nanites
|
2020-02-20 00:52:55 +02:00 |
|
|
Unknown
|
c920d198e2
|
Update Viro to /tg/ standards
|
2020-02-19 12:17:57 -05:00 |
|
|
Ghom
|
eb342d1591
|
Update mood.dm
|
2020-02-19 17:14:30 +01:00 |
|
|
Ghommie
|
ee1f61b5de
|
F
|
2020-02-19 14:26:11 +01:00 |
|
|
Ghommie
|
057b6f591c
|
HEEY
|
2020-02-19 14:23:12 +01:00 |
|
|
Ghom
|
b028b296f5
|
Update mob_holder.dm
|
2020-02-17 12:17:33 +01:00 |
|
|
Ghom
|
66d5e0e346
|
Update station.dm
|
2020-02-17 01:03:29 +01:00 |
|
|
Ghom
|
3703110dda
|
Makes the mob holder examine less dumb.
|
2020-02-16 16:10:20 +01:00 |
|
|
kevinz000
|
7ee04aa608
|
Merge pull request #10998 from Ghommie/Ghommie-cit569
Something about the in operator and spaceDMM version update.
|
2020-02-15 12:17:37 -07:00 |
|
|
kevinz000
|
b46dd3246d
|
Merge pull request #10968 from Citadel-Station-13/Ghommie-patch-4
/datum/element/cleaning cleans your face!
|
2020-02-15 12:16:39 -07:00 |
|
|
kevinz000
|
f79148d549
|
Merge pull request #10947 from Ghommie/Ghommie-cit563
Holopad static fix and a few other mistakes.
|
2020-02-15 12:16:23 -07:00 |
|
|
kevinz000
|
957c6168b6
|
Merge pull request #11006 from Ghommie/Ghommie-cit570
Something about a couple stack trace issues.
|
2020-02-15 11:47:30 -07:00 |
|
|
kevinz000
|
76b5dec4bb
|
Merge pull request #11040 from Ghommie/Ghommie-cit573
Further mob holder fixes.
|
2020-02-15 11:44:25 -07:00 |
|
|
TrilbySpaceClone
|
a1f1a01a81
|
grammer and quiver
|
2020-02-15 00:52:19 -05:00 |
|
|
TrilbySpaceClone
|
bbe1ddc0cf
|
silk, bows, and graytide!
|
2020-02-14 23:04:02 -05:00 |
|
|
Ghom
|
0a1c3bd084
|
Merge branch 'master' into Ghommie-cit539
|
2020-02-14 19:42:36 +01:00 |
|
|
Ghom
|
b0d85c4aea
|
Merge pull request #11070 from Citadel-Station-13/kevinz000-patch-18
ghosts can not force re rendering of storage to a different size
|
2020-02-14 19:22:05 +01:00 |
|
|
Ghom
|
64882b8a90
|
Merge pull request #10993 from Linzolle/bows
adds the bow
|
2020-02-14 08:01:12 +01:00 |
|
|
Linzolle
|
790b7bf9cc
|
sanity check
|
2020-02-13 15:20:01 -06:00 |
|
|
Linzolle
|
083a6e4c19
|
runtime?
|
2020-02-13 13:29:07 -06:00 |
|
|
Linzolle
|
9a87087378
|
message unnecessary
|
2020-02-13 13:26:19 -06:00 |
|
|
Linzolle
|
f890317810
|
maybe this will work
|
2020-02-13 13:02:51 -06:00 |
|
|
Linzolle
|
d22631700c
|
update the fucking craft component because artur forgot to
|
2020-02-13 12:59:56 -06:00 |
|
|
Artur
|
7964d768fa
|
Initial Commit
|
2020-02-13 20:51:52 +02:00 |
|
|
Artur
|
c01f78b8e8
|
Conflict fix
|
2020-02-13 17:52:28 +02:00 |
|
|
Ghom
|
8b44b02f2d
|
Merge pull request #11044 from Arturlang/TGUI_Next_Uplink
TGUI Next Uplinks
|
2020-02-13 16:50:10 +01:00 |
|
|
Ghom
|
7198637463
|
Merge pull request #11038 from Citadel-Station-13/kevinz000-patch-7
STOP_PROCESSING now also removes from currentrun
|
2020-02-13 15:05:51 +01:00 |
|
|
Artur
|
8c37cfef24
|
Should work now
|
2020-02-13 15:26:18 +02:00 |
|
|
kevinz000
|
87097fb059
|
Update storage.dm
|
2020-02-13 05:30:44 -07:00 |
|
|
kevinz000
|
3aa3fc3614
|
Update storage.dm
|
2020-02-13 05:15:19 -07:00 |
|
|
kevinz000
|
4345f01322
|
Merge pull request #11021 from Ghommie/Ghommie-cit571
Porting tgs DMAPI and script updates, getrev updates and OoM errors handling.
|
2020-02-13 04:11:01 -07:00 |
|
|
Artur
|
21ce2242ac
|
Conflict fix
|
2020-02-12 16:21:29 +02:00 |
|
|
Ghom
|
12b84aa333
|
Update mob_holder.dm
|
2020-02-12 12:43:47 +01:00 |
|
|
kevinz000
|
d8d6a8efb8
|
lazy-be-gone
|
2020-02-12 02:15:56 -07:00 |
|
|
kevinz000
|
33b3d06d4c
|
im lazy
|
2020-02-12 01:44:28 -07:00 |
|
|
Ghommie
|
e5ab230b26
|
Monky chokehold deluxe.
|
2020-02-12 09:32:38 +01:00 |
|
|
Ghommie
|
e099ed9578
|
Further mob holder fixes.
|
2020-02-12 09:24:49 +01:00 |
|
|
Ghom
|
2ed19e0a5a
|
Merge pull request #10861 from ancientpower/far-sliding-port
Ports /vg/station drink sliding
|
2020-02-12 09:06:03 +01:00 |
|
|
Artur
|
a9a167b9d3
|
Suffering and co
|
2020-02-11 20:18:32 +02:00 |
|
|
Ghommie
|
0caabe8018
|
Porting tgs DMAPI and script updates, as well as getrev updates and something bout OoM.
|
2020-02-11 15:23:03 +01:00 |
|