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 |
|
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 |
|
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 |
|
Lin
|
e8ea16c3f2
|
Merge pull request #10874 from Citadel-Station-13/Ghommie-patch-6
Fixes the petting element.
|
2020-02-04 20:34:59 +00:00 |
|
Artur
|
614a44ea18
|
Merge remote-tracking branch 'upstream/master' into TGUI_Next_Crafting
|
2020-02-04 13:11:02 +01:00 |
|
Artur
|
ed60724a8e
|
Whoops
|
2020-02-04 12:13:14 +01:00 |
|
Artur
|
0391513220
|
Works now
|
2020-02-04 12:05:15 +01:00 |
|
kevinz000
|
275b1f73e0
|
Merge pull request #10849 from Ghommie/Ghommie-cit547
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
|
2020-02-04 03:39:14 -07:00 |
|
Artur
|
4bd916d08a
|
Adds the initial crafting UI stuff.
|
2020-02-04 10:28:53 +01:00 |
|
Seris02
|
49f80d52a8
|
bug fixes
|
2020-02-04 17:18:45 +08:00 |
|
Ghom
|
6a88e37ff2
|
Merge pull request #10801 from Seris02/risingbasschanges
changes to rising bass
|
2020-02-04 05:14:07 +01:00 |
|
Ghommie
|
89466de29e
|
Good catch linter.
|
2020-02-04 02:30:14 +01:00 |
|
Ghommie
|
7723450d11
|
welp.
|
2020-02-04 02:21:23 +01:00 |
|
Ghommie
|
d13d8dd953
|
Less hacky.
|
2020-02-04 02:13:11 +01:00 |
|
Ghommie
|
63c8612ccd
|
Refactoring mob holders into an element.
|
2020-02-04 01:42:59 +01:00 |
|
Ghom
|
40f7a72e3c
|
Update slippery.dm
|
2020-02-03 20:32:50 +01:00 |
|
Ghom
|
3cb1a0e9c8
|
Update slippery.dm
|
2020-02-03 20:31:57 +01:00 |
|
Ghom
|
73d865d0f3
|
Fixes the petting element.
|
2020-02-03 18:42:22 +01:00 |
|
Putnam
|
53cad493a7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into antag-overhaul
|
2020-02-03 03:17:23 -08:00 |
|
Artur
|
e7ddfdd8d8
|
Merge remote-tracking branch 'upstream/master' into TGUIs_Nexties
|
2020-02-02 13:31:54 +01:00 |
|
kevinz000
|
66a2216ef3
|
Merge pull request #10829 from Ghommie/Ghommie-cit544
Fixed and brutalized clown op slippery weapons a little.
|
2020-02-02 03:16:23 -07:00 |
|
kevinz000
|
33577e0d82
|
Merge pull request #10813 from Ghommie/Ghommie-cit540
Unicode support updates from tgstation.
|
2020-02-02 01:47:24 -07:00 |
|
Putnam
|
e812844c70
|
Revert "</span>"
This reverts commit d6d01d848c.
|
2020-02-01 21:05:27 -08:00 |
|
Seris02
|
18489e5b65
|
merge fixes
|
2020-02-02 11:51:26 +08:00 |
|
Ghommie
|
8de11845d5
|
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
|
2020-02-02 03:39:49 +01:00 |
|
Ghom
|
d6c36f363e
|
Merge pull request #10817 from IronEleven/ViroStatPort
Updates Virus Symptom Stats to Match TG
|
2020-02-02 01:41:11 +01:00 |
|
Ghom
|
f6e30ee6aa
|
Merge pull request #10841 from Kraseo/boxing
Fixes being able to pull after wearing boxing gloves
|
2020-02-01 19:13:30 +01:00 |
|
Ghom
|
d19b7a7695
|
Merge pull request #10744 from r4d6/Moar-Engines
Moar engines!
|
2020-02-01 19:11:10 +01:00 |
|