210b7b281c
Merge pull request #12727 from Citadel-Station-13/silicons-patch-19
...
bandaids around turnstiles being bad code until it can have its movement checks refactored
2020-07-20 18:25:01 -05:00
7adae61ade
Merge pull request #12773 from Citadel-Station-13/silicons-patch-28
...
jexp exemption now also exempts from antag days remaining locks
2020-07-20 18:22:42 -05:00
923b4cbb4f
Merge pull request #12823 from Citadel-Station-13/gravity_update
...
gravity now immediately updates on entering/exiting areas with different gravity and space meaning no more slow for 4 seconds while in a hardsuit and then fast with jetpack
2020-07-20 18:21:55 -05:00
67a6330e77
Merge pull request #12786 from silicons/survivalists
...
makes survivalists pseudoantags again and limits summon guns/magic to one use
2020-07-20 18:20:08 -05:00
267186a5d3
Merge pull request #12646 from Chiirno/emi
...
[READY] Alt-click cigarette pack functionality added to pill bottles.
2020-07-20 16:15:38 -07:00
dec84af233
Merge pull request #12830 from Funce/genetic-spider-fix
...
Fixes genewebs being impossibly impassable
2020-07-20 10:49:10 -07:00
64d5bd0030
switches around messages
2020-07-19 21:38:44 -03:00
0c07faa3e0
For future reference, '.' return overrides 'return' statements
2020-07-20 12:22:18 +12:00
2af449a3c7
Fixes genewebs being impossibly impassable
2020-07-20 11:55:23 +12:00
f265b85d3b
Merge pull request #12810 from lolman360/master
...
service borg fix/tweak
2020-07-20 11:42:59 +12:00
b47872c079
Merge pull request #12802 from Citadel-Station-13/silicons-patch-31
...
fixes eshields not reflecting while active blocking uh oh
2020-07-19 11:12:32 -05:00
5b408d5b33
Update space.dm
2020-07-18 20:52:15 -07:00
9b1aa39497
Update space.dm
2020-07-18 20:51:30 -07:00
53dd4fc857
Update areas.dm
2020-07-18 20:50:28 -07:00
ba3dc6a73b
Merge pull request #12679 from silicons/unarmed_parry
...
Ok ok hear me out: Implements unarmed parry.
2020-07-18 17:02:02 -05:00
f696a461af
Update RSF.dm
2020-07-18 16:10:25 +10:00
0e38e1ff39
e
2020-07-18 16:03:32 +10:00
a8e2b84ad8
Merge pull request #12763 from zeroisthebiggay/b
...
hopefully fixes records possibly
2020-07-17 17:10:40 -07:00
044525519a
Merge pull request #12750 from timothyteakettle/loadout-plushies
...
replaces plushies in the loadout menu with a choice box
2020-07-17 17:10:14 -07:00
655afda020
Merge pull request #12780 from BlackMajor/borgo
...
Even more engiborg power creep
2020-07-17 17:08:23 -07:00
3d5c77f62b
Merge pull request #12779 from b1tt3r1n0/circlegame
...
Circle Game, Updated
2020-07-17 17:08:06 -07:00
04df84d1e0
Merge pull request #12776 from timothyteakettle/snail-shells
...
snail shell backpack
2020-07-17 17:07:46 -07:00
813fd9b3e0
Update shields.dm
2020-07-17 09:00:02 -07:00
9b671b7dd1
I'm gonna regret this. Adds stock parts (meaning cells) to the gripper list
2020-07-18 03:08:52 +12:00
eb9b3da581
Blacklist logic fix
2020-07-17 16:13:18 +12:00
993b4ec222
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-16 19:39:46 -07:00
e03948dcba
Merge pull request #12229 from Arturlang/TGUI-3.0
...
[READY]TGUI 3.0
2020-07-16 17:28:42 -07:00
fc909cd7c6
Added material sheets and tiles. This took more work than you'd think.
2020-07-17 01:17:54 +12:00
af65b626e3
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-16 15:56:08 +03:00
2afab07b4a
https://github.com/tgstation/tgstation/pull/52255
2020-07-16 20:05:37 +08:00
f653fd5c3c
kay
2020-07-15 14:58:51 -07:00
0184739005
undo the woopsy
2020-07-15 19:53:37 +01:00
6121cbd091
Merge pull request #12738 from timothyteakettle/travelling-traders
...
the travelling trader midround event
2020-07-15 08:50:20 -07:00
06a4e57de9
changing this just means they can pick up jetpacks
2020-07-16 02:11:38 +12:00
bd7c9d11d3
oh no
2020-07-16 02:02:29 +12:00
d678806143
Circle Game, Updated
...
Title
2020-07-14 23:40:09 -04:00
0a4a0fadb3
snails
2020-07-14 20:59:25 +01:00
57e0cafb15
Fixes clockwork sleepers
2020-07-14 20:01:04 +03:00
a381ed324d
Update game_mode.dm
2020-07-14 09:28:50 -07:00
8af78d1189
Merge remote-tracking branch 'origin/TGUI-3.0' into TGUI-3.0
2020-07-14 18:10:29 +03:00
f5ee74803f
Updates minter to tg and the prereqs
2020-07-14 18:08:12 +03:00
75eb276c98
Merge branch 'master' into TGUI-3.0
2020-07-14 16:17:23 +03:00
c964cadd85
Makes amber alert work
2020-07-14 16:15:32 +03:00
5b3050f692
b
2020-07-13 17:01:41 -04:00
4c0248835f
b
2020-07-13 17:01:23 -04:00
8de062adbb
fix
2020-07-13 19:46:51 +01:00
85f8491003
b
2020-07-13 14:45:18 -04:00
2be790e8d7
Merge pull request #12736 from Citadel-Station-13/silicons-patch-21
...
hey let's not have 25% micro borgs going around killing people
2020-07-13 11:51:10 -05:00
5f9364c5f8
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
75c962ef7b
handle removal
2020-07-12 20:18:49 +01:00
Lin