ab28e2facb
Air tanks get their own sprite, plus reset fix.
2017-09-27 15:45:41 -05:00
18545eb41c
Merge pull request #2935 from Citadel-Station-13/upstream-merge-30893
...
[MIRROR] Datum abductors refactor
2017-09-27 16:31:53 -04:00
000ce51c9a
Merge pull request #2927 from Citadel-Station-13/upstream-merge-30958
...
[MIRROR] Makes a flags var use NONE instead of 0
2017-09-27 16:31:38 -04:00
e58d05202b
Automatic changelog generation for PR #2918 [ci skip]
2017-09-27 15:31:26 -05:00
a099fb627c
Merge pull request #2918 from Citadel-Station-13/upstream-merge-30953
...
[MIRROR] Suiciding with a gun blows your brain out
2017-09-27 16:31:25 -04:00
2e133c0b2c
Update ears.dm
2017-09-27 15:12:22 -05:00
2163132c52
Update ballistic.dm
2017-09-27 15:10:59 -05:00
d2149124b7
Update mobs.dm
2017-09-27 15:10:01 -05:00
526c038f5d
Merge pull request #2959 from Citadel-Station-13/upstream-merge-31036
...
[MIRROR] Fixes a thing.
2017-09-27 15:34:30 -04:00
d749cc4924
Fixes a thing.
2017-09-27 13:22:16 -05:00
ebdea5382b
Here it is.
2017-09-27 13:22:16 -05:00
bc0868983a
Automatic changelog generation for PR #2953 [ci skip]
2017-09-27 11:49:50 -05:00
68e23ba081
Merge pull request #2953 from Citadel-Station-13/upstream-merge-31017
...
[MIRROR] Fixes MMI to AI law transfer
2017-09-27 12:49:48 -04:00
f655adfb7b
Merge pull request #2951 from Citadel-Station-13/upstream-merge-31003
...
[MIRROR] Some strings -> name var
2017-09-27 12:48:57 -04:00
65bcd10223
Fixes MMI to AI law transfer
2017-09-26 16:52:17 -05:00
10bf80139c
Fixes MMI to AI law transfer ( #31017 )
...
* Fixes MMI to AI law transfer
* Fixes issue with preloaded laws on AI core
2017-09-26 16:52:17 -05:00
e9b8e162e6
Some strings -> name var
2017-09-26 16:00:59 -05:00
af7dafd383
Some names -> string
2017-09-26 16:00:59 -05:00
b51e4457f5
Merge pull request #2949 from Citadel-Station-13/upstream-merge-31009
...
[MIRROR] Fixes alium leap exploit
2017-09-26 15:07:06 -04:00
dab03b249d
Merge pull request #2948 from Citadel-Station-13/upstream-merge-30992
...
[MIRROR] Spiderpalooza 1: Foods!
2017-09-26 15:01:02 -04:00
5727a5873a
Automatic changelog generation for PR #2947 [ci skip]
2017-09-26 14:00:47 -05:00
26a567f6f2
Merge pull request #2947 from Citadel-Station-13/upstream-merge-31010
...
[MIRROR] Adds two more IMPORANT color burger colors
2017-09-26 15:00:46 -04:00
8380e5b2e2
Merge pull request #2945 from Citadel-Station-13/upstream-merge-30987
...
[MIRROR] Fixes missing Href tokens
2017-09-26 15:00:17 -04:00
e2d748ae8b
Merge pull request #2944 from Citadel-Station-13/upstream-merge-31008
...
[MIRROR] fixes shuttles creating duplicate areas
2017-09-26 14:59:51 -04:00
8aa7a15b88
Automatic changelog generation for PR #2942 [ci skip]
2017-09-26 13:59:23 -05:00
8b37c32a17
Merge pull request #2942 from Citadel-Station-13/upstream-merge-30967
...
[MIRROR] Fixes jump boots sleeper bug, adds return value to /atom/movable/throw_at
2017-09-26 14:59:20 -04:00
14916124b5
Automatic changelog generation for PR #2940 [ci skip]
2017-09-26 13:58:59 -05:00
5f26685273
Merge pull request #2940 from Citadel-Station-13/upstream-merge-30894
...
[MIRROR] Fixes suppressing weapons in your bag / pocket
2017-09-26 14:58:57 -04:00
67f7ce5084
Automatic changelog generation for PR #2939 [ci skip]
2017-09-26 13:58:25 -05:00
47a8ce6ae8
Merge pull request #2939 from Citadel-Station-13/upstream-merge-30863
...
[MIRROR] Bluespace pipes
2017-09-26 14:58:23 -04:00
8ecba65f88
Fixes alium leap exploit
2017-09-26 13:54:26 -05:00
4bab4181f2
Fixes alium leap exploit
2017-09-26 13:54:26 -05:00
a7d0b50808
Spiderpalooza 1: Foods!
2017-09-26 11:32:36 -05:00
f7d50cf44b
Adds two more IMPORANT color burger colors
2017-09-26 08:52:28 -05:00
14fba23c55
Adds two more IMPORANT color burger colors ( #31010 )
...
* Update snacks_burgers.dm
* Update recipes_burger.dm
* Update snacks_burgers.dm
* Update snacks_burgers.dm
2017-09-26 08:52:27 -05:00
109b72bd74
Fixes missing Href tokens
2017-09-26 07:27:49 -05:00
41276ce631
Fixes missing Href tokens ( #30987 )
...
* Fixes missing Href tokens
* Add missing form field. Fixes #30986
2017-09-26 07:27:49 -05:00
bf233f6b8e
fixes shuttles creating duplicate areas
2017-09-26 07:26:37 -05:00
2610101820
fixes shuttles creating duplicate area types ( #31008 )
2017-09-26 07:26:37 -05:00
2612f2b9cf
Update beam_rifle.dm ( #2943 )
2017-09-26 07:54:30 -04:00
0d85494123
Fixes jump boots sleeper bug, adds return value to /atom/movable/throw_at
2017-09-26 04:29:18 -05:00
1aef27a0f0
Fixes jump boots sleeper bug, adds return value to /atom/movable/throw_at ( #30967 )
...
* Jump boots fix
* requested changes
* Requested changes, also whoops
2017-09-26 04:29:18 -05:00
94c6e04c72
Fixes suppressing weapons in your bag / pocket
2017-09-26 04:19:44 -05:00
b79dd78089
Fixes suppressing weapons in your bag / pocket ( #30894 )
...
* Fixes suppressing in pocked and w_class issues
* Used defines for some things
* Reworded
* Removed the now redundant initial_w_class var
* Early returns
* Null
2017-09-26 04:19:44 -05:00
26f0af19e0
update
2017-09-26 00:00:07 -05:00
e878e75c42
donator item
2017-09-25 23:49:06 -05:00
9a960678f1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2017-09-25 19:56:45 -05:00
8ff51624e1
Merge pull request #2934 from Citadel-Station-13/upstream-merge-30913
...
[MIRROR] Stops AIs from giving the borg a free secondary light
2017-09-25 13:29:02 -04:00
d163c20d09
Bluespace pipes
2017-09-25 12:28:14 -05:00
0a43bddaa1
Merge pull request #30863 from pubby/bluepipe
...
Bluespace pipes
2017-09-25 12:28:14 -05:00
RandomMarine