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 |
|
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 |
|
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 |
|
Ghom
|
2ed19e0a5a
|
Merge pull request #10861 from ancientpower/far-sliding-port
Ports /vg/station drink sliding
|
2020-02-12 09:06:03 +01: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 |
|
kevinz000
|
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 |
|
Lin
|
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 |
|
Artur
|
8e50c278bb
|
Rebuild and misc nuke tweak
|
2020-02-10 17:34:14 +01:00 |
|
Ghom
|
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 |
|
kevinz000
|
c29e0e1a1d
|
Merge pull request #10596 from Seris02/hijackbackup
Hijack Implant
|
2020-02-10 04:16:14 -07:00 |
|
kevinz000
|
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 |
|
Artur
|
816f94bd61
|
pandemic fixes
|
2020-02-10 10:20:57 +02:00 |
|
Ghom
|
c7614958bc
|
Merge pull request #10937 from Arturlang/debug_outfit_updates
Updates the debug outfit
|
2020-02-09 22:49:22 +01:00 |
|
Ghom
|
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 |
|
Arturlang
|
29207b22fb
|
Merge branch 'master' into debug_outfit_updates
|
2020-02-09 22:05:26 +02:00 |
|
TrilbySpaceClone
|
30c78c5be2
|
Let their be lists
|
2020-02-08 02:37:37 -05:00 |
|
kevinz000
|
79a72fac24
|
fix
|
2020-02-07 23:32:36 -07:00 |
|
kevinz000
|
7c16830e91
|
ok
|
2020-02-07 23:31:38 -07:00 |
|
Ghom
|
bb140df39c
|
Fixing mob holders
|
2020-02-08 04:04:16 +01:00 |
|
Ghom
|
8365fec82e
|
Update negative.dm
|
2020-02-08 00:05:23 +01:00 |
|
Seris02
|
4ec99a38e2
|
merge fixes
|
2020-02-07 15:28:05 +08:00 |
|
kevinz000
|
62b0e62952
|
Merge pull request #10623 from Putnam3145/antag-overhaul
Better antag objectives: for real this time
|
2020-02-06 16:25:22 -07:00 |
|
Ghommie
|
16b655b887
|
Adds the ELEMENT_DETACH flag to two elements
|
2020-02-06 23:19:21 +01:00 |
|
Artur
|
c9dc35fd9a
|
Updates the debug outfit
|
2020-02-06 18:42:23 +01:00 |
|
kevinz000
|
18910a23a2
|
Merge pull request #10881 from Ghommie/Ghommie-cit552
Refactoring mob holders into an element.
|
2020-02-06 00:41:28 -07:00 |
|
Artur
|
f0b22a119d
|
Interface routing and modifying uplink component
|
2020-02-05 20:03:36 +01:00 |
|
kevinz000
|
a45038d214
|
Update pockets.dm
|
2020-02-05 03:31:55 -07:00 |
|
Seris02
|
d0100345fd
|
done hopefully
|
2020-02-05 17:00:38 +08:00 |
|
Seris02
|
6cc6aa12be
|
yeehaw it's done
|
2020-02-05 16:54:57 +08:00 |
|
kevinz000
|
8c737b6ce7
|
Update debuffs.dm
|
2020-02-05 00:43:42 -07:00 |
|
Ghom
|
402283e86a
|
Merge pull request #10791 from Arturlang/more_bloodsucker_tweaks
[READY] Further tweaks to bloodsuckers
|
2020-02-05 07:23:36 +01:00 |
|
Ghom
|
642a8c4217
|
Merge pull request #10893 from Arturlang/TGUI_Next_Crafting
[READY]TGUI Next Crafting
|
2020-02-05 00:04:21 +01:00 |
|
ancientpower
|
a85f05a628
|
requested changes
|
2020-02-04 16:58:24 -06:00 |
|
ancientpower
|
0d6ffbc432
|
fixed it for real this time
|
2020-02-04 16:38:20 -06:00 |
|
ancientpower
|
9dd411f11b
|
fixes the restoration for reals
|
2020-02-04 16:11:12 -06:00 |
|