b028b296f5
Update mob_holder.dm
2020-02-17 12:17:33 +01:00
aff71e7f14
Initial Commit. Adds space ruins to station z.
2020-02-17 23:44:06 +13:00
c97111beda
Reorganise Food + Balance Tweaks
...
-Reorganised -ALL- foods in the crafting menu.
-Made a section for Eastern Dishes, Mexican Dishes, and Sweets
-Made Bowls, Salads, Soups, Eggs Benedict, and Omelettes normal sized.
-Moved Easter Recipies to the food files, fixing it in the process.
-Capitalised a few things.
2020-02-17 05:32:03 -05:00
66d5e0e346
Update station.dm
2020-02-17 01:03:29 +01:00
3703110dda
Makes the mob holder examine less dumb.
2020-02-16 16:10:20 +01:00
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
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
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
957c6168b6
Merge pull request #11006 from Ghommie/Ghommie-cit570
...
Something about a couple stack trace issues.
2020-02-15 11:47:30 -07:00
76b5dec4bb
Merge pull request #11040 from Ghommie/Ghommie-cit573
...
Further mob holder fixes.
2020-02-15 11:44:25 -07:00
2d9c8ce8fc
fixing merge conflicts
2020-02-15 15:41:52 +08:00
a1f1a01a81
grammer and quiver
2020-02-15 00:52:19 -05:00
bbe1ddc0cf
silk, bows, and graytide!
2020-02-14 23:04:02 -05:00
0a1c3bd084
Merge branch 'master' into Ghommie-cit539
2020-02-14 19:42:36 +01:00
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
64882b8a90
Merge pull request #10993 from Linzolle/bows
...
adds the bow
2020-02-14 08:01:12 +01:00
790b7bf9cc
sanity check
2020-02-13 15:20:01 -06:00
083a6e4c19
runtime?
2020-02-13 13:29:07 -06:00
9a87087378
message unnecessary
2020-02-13 13:26:19 -06:00
f890317810
maybe this will work
2020-02-13 13:02:51 -06:00
d22631700c
update the fucking craft component because artur forgot to
2020-02-13 12:59:56 -06:00
7964d768fa
Initial Commit
2020-02-13 20:51:52 +02:00
c01f78b8e8
Conflict fix
2020-02-13 17:52:28 +02:00
8b44b02f2d
Merge pull request #11044 from Arturlang/TGUI_Next_Uplink
...
TGUI Next Uplinks
2020-02-13 16:50:10 +01:00
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
8c37cfef24
Should work now
2020-02-13 15:26:18 +02:00
87097fb059
Update storage.dm
2020-02-13 05:30:44 -07:00
3aa3fc3614
Update storage.dm
2020-02-13 05:15:19 -07:00
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
eca0e0f2dc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-13 00:39:20 -07:00
21ce2242ac
Conflict fix
2020-02-12 16:21:29 +02:00
12b84aa333
Update mob_holder.dm
2020-02-12 12:43:47 +01:00
d8d6a8efb8
lazy-be-gone
2020-02-12 02:15:56 -07:00
33b3d06d4c
im lazy
2020-02-12 01:44:28 -07:00
e5ab230b26
Monky chokehold deluxe.
2020-02-12 09:32:38 +01:00
e099ed9578
Further mob holder fixes.
2020-02-12 09:24:49 +01:00
2ed19e0a5a
Merge pull request #10861 from ancientpower/far-sliding-port
...
Ports /vg/station drink sliding
2020-02-12 09:06:03 +01:00
a9a167b9d3
Suffering and co
2020-02-11 20:18:32 +02:00
0caabe8018
Porting tgs DMAPI and script updates, as well as getrev updates and something bout OoM.
2020-02-11 15:23:03 +01:00
58db43621d
Merge pull request #10941 from Ghommie/Ghommie-cit561
...
Adds the ELEMENT_DETACH flag to two elements
2020-02-11 00:42:15 -07:00
4797b5edc8
Merge pull request #10961 from Citadel-Station-13/Ghommie-patch-2-1
...
Fixes an issue with the nearsighted prescription glasses taking over worn eyewear
2020-02-10 20:28:57 +00:00
8e50c278bb
Rebuild and misc nuke tweak
2020-02-10 17:34:14 +01:00
c19549c7f9
Something about a couple stack trace issues.
2020-02-10 14:51:05 +01:00
3ee4f25626
Merge pull request #11001 from Arturlang/P.A.N.D.E.M.I.C_fixes
...
Pandemic Fixes
2020-02-10 12:22:40 +01:00
c29e0e1a1d
Merge pull request #10596 from Seris02/hijackbackup
...
Hijack Implant
2020-02-10 04:16:14 -07:00
4416d9de46
Merge pull request #10965 from Citadel-Station-13/Ghommie-patch-2
...
Fixing the mob holder element
2020-02-10 04:11:51 -07:00
816f94bd61
pandemic fixes
2020-02-10 10:20:57 +02:00
c34714cb90
Something about the in operator and spaceDMM version update.
2020-02-10 07:37:59 +01:00
c7614958bc
Merge pull request #10937 from Arturlang/debug_outfit_updates
...
Updates the debug outfit
2020-02-09 22:49:22 +01:00
d991fa1252
Merge pull request #10972 from Trilbyspaceclone/so-then-I-started-nerfing
...
Removes bone armor and dagger from crafting menu
2020-02-09 21:08:16 +01:00
Ghom