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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Kraseo
|
d70665a0c3
|
got asked to do this
|
2020-02-01 19:03:35 +01:00 |
|
Kraseo
|
aa2e4299e2
|
my grug brain took more than 10 attempts to get this to work
|
2020-02-01 18:51:18 +01:00 |
|
Ghom
|
051811ed46
|
Merge pull request #10811 from Arturlang/crafting_componitization
[READY]Ports TG updates to crafting and componentizes it
|
2020-02-01 18:36:51 +01:00 |
|
Putnam
|
d6d01d848c
|
</span>
|
2020-02-01 06:01:54 -08:00 |
|
Putnam3145
|
33122d0d92
|
Merge branch 'master' into TGUIs_Nexties
|
2020-02-01 00:49:10 -08:00 |
|
Ghommie
|
07b6d278a1
|
fixed and brutalized clown op slippery weapons a little.
|
2020-02-01 04:48:40 +01:00 |
|
Ghom
|
5257ab2e00
|
Merge pull request #10559 from Seris02/custompie
custom reagent pie smite
|
2020-02-01 01:46:15 +01:00 |
|
IronEleven
|
fa7b38d3bd
|
Stat Changes
Changes symptom stats to match tg
|
2020-01-31 19:03:30 -05:00 |
|
IronEleven
|
d2e6f4abf0
|
Comment Typo Fix
Might as well fix that while I'm in here
|
2020-01-31 19:02:59 -05:00 |
|
Putnam
|
809f57a15d
|
also added kill-once objectives
|
2020-01-31 12:25:19 -08:00 |
|
Artur
|
8bb0e30036
|
Initial Commit V3
|
2020-01-31 18:17:14 +01:00 |
|
Seris02
|
6304ddbc9e
|
one fix
|
2020-01-31 12:44:38 +08:00 |
|
Seris02
|
5f1a2bed76
|
rising bass changes
|
2020-01-31 12:42:22 +08:00 |
|
Ghommie
|
188f726ffd
|
unicode support port wip
|
2020-01-31 05:32:00 +01:00 |
|
Arturlang
|
83ce84cdc4
|
Merge branch 'master' into TGUIs_Nexties
|
2020-01-30 20:46:20 +02:00 |
|
Artur
|
1bf2a3e7ca
|
Initial Commit
|
2020-01-30 17:28:02 +01:00 |
|
Ghom
|
7839724013
|
Merge pull request #10295 from Citadel-Station-13/kevinz000-patch-2
Brain surgery can now fix an abductee's mindsnap objectives
|
2020-01-29 05:34:49 +01:00 |
|
kevinz000
|
3bf0e1d5c4
|
Merge pull request #10701 from Ghommie/Ghommie-cit527
Ported further runtime fixes by AnturK.
|
2020-01-28 17:57:26 -07:00 |
|
r4d6
|
ad55c7235d
|
I knew I forgot something
|
2020-01-26 21:21:26 -05:00 |
|
r4d6
|
09448b86e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Moar-Engines
|
2020-01-26 20:58:37 -05:00 |
|
r4d6
|
4884165d4f
|
Add TEG, Code & config
|
2020-01-26 20:58:16 -05:00 |
|
kevinz000
|
603ab65ed1
|
Merge pull request #10151 from Ghommie/Ghommie-cit450
refactors area code to allow for multiple areas to share the same APC, fire, air alarms etc.
|
2020-01-25 19:33:26 -07:00 |
|