CitadelStationBot
4f281e5ea1
[MIRROR] Blackbox stat for internet midis ( #2964 )
...
* Blackbox stat for internet midis
* Blackbox stat for internet midis
2017-09-28 05:56:26 -07:00
LetterJay
7a0ffb8a67
Merge pull request #2941 from Citadel-Station-13/upstream-merge-30888
...
[MIRROR] Refactors cinematics.
2017-09-27 23:42:35 -04:00
LetterJay
d8de375ada
Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969
...
[MIRROR] DisplayTimeText mk2
2017-09-27 23:39:03 -04:00
LetterJay
18545eb41c
Merge pull request #2935 from Citadel-Station-13/upstream-merge-30893
...
[MIRROR] Datum abductors refactor
2017-09-27 16:31:53 -04:00
LetterJay
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
LetterJay
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
LetterJay
2e133c0b2c
Update ears.dm
2017-09-27 15:12:22 -05:00
LetterJay
2163132c52
Update ballistic.dm
2017-09-27 15:10:59 -05:00
vuonojenmustaturska
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
LetterJay
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
LetterJay
ec3fc4441c
Update cinematic.dm
2017-09-26 14:02:49 -05:00
LetterJay
dab03b249d
Merge pull request #2948 from Citadel-Station-13/upstream-merge-30992
...
[MIRROR] Spiderpalooza 1: Foods!
2017-09-26 15:01:02 -04:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
47a8ce6ae8
Merge pull request #2939 from Citadel-Station-13/upstream-merge-30863
...
[MIRROR] Bluespace pipes
2017-09-26 14:58:23 -04:00
ShizCalev
4bab4181f2
Fixes alium leap exploit
2017-09-26 13:54:26 -05:00
Armhulen
a7d0b50808
Spiderpalooza 1: Foods!
2017-09-26 11:32:36 -05:00
jughu
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
Jordan Brown
41276ce631
Fixes missing Href tokens ( #30987 )
...
* Fixes missing Href tokens
* Add missing form field. Fixes #30986
2017-09-26 07:27:49 -05:00
Emmett Gaines
2610101820
fixes shuttles creating duplicate area types ( #31008 )
2017-09-26 07:26:37 -05:00
kevinz000
2612f2b9cf
Update beam_rifle.dm ( #2943 )
2017-09-26 07:54:30 -04:00
vuonojenmustaturska
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
AnturK
fd0bc465cc
Refactors cinematics.
2017-09-26 04:20:59 -05:00
ShizCalev
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
LetterJay
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
Jordan Brown
0a43bddaa1
Merge pull request #30863 from pubby/bluepipe
...
Bluespace pipes
2017-09-25 12:28:14 -05:00
LetterJay
8fd6d9d883
Merge pull request #2933 from Citadel-Station-13/upstream-merge-30980
...
[MIRROR] Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart
2017-09-25 13:28:05 -04:00
LetterJay
196caaf3e1
Merge pull request #2931 from Citadel-Station-13/upstream-merge-30984
...
[MIRROR] Makes keywords_lookup use the global token
2017-09-25 13:27:46 -04:00
LetterJay
45751464e0
Merge pull request #2930 from Citadel-Station-13/upstream-merge-30975
...
[MIRROR] Href tokens
2017-09-25 13:27:27 -04:00
LetterJay
954b056e97
Update security.dm
2017-09-25 11:56:55 -05:00
Poojawa
2071dfd1a5
Readds alert level sounds ( #2920 )
2017-09-24 21:21:33 -05:00
ShizCalev
169aa85d9c
DisplayTimeText mk2
2017-09-24 18:59:57 -05:00
pubby
34e186dadb
Datum abductors refactor
2017-09-24 18:00:49 -05:00
KorPhaeron
31f6898a87
Stops AIs from giving the borg a free secondary light ( #30913 )
...
* Stops AIs from giving the borg a free secondary light
* Using a camera var now
* Wrong if
* My brain is not working
2017-09-24 17:58:37 -05:00
vuonojenmustaturska
11a3395690
Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart
2017-09-24 17:42:13 -05:00
oranges
a6ae23aefb
Merge pull request #30984 from tgstation/Cyberboss-patch-4
...
Makes keywords_lookup use the global token
2017-09-24 17:35:49 -05:00
oranges
6278d49662
Href tokens
2017-09-24 17:34:37 -05:00
LetterJay
beedb36400
Merge pull request #2909 from Poojawa/flightsuit-adjustments
...
Flight suit tweaks
2017-09-24 15:47:50 -04:00
LetterJay
076ba227e5
Merge pull request #2583 from deathride58/screenshake
...
Extra Screenshake and Screenshake accessories.
2017-09-24 11:34:50 -04:00
LetterJay
914e661618
Merge pull request #2908 from Citadel-Station-13/Ashwalker-nerfs
...
Mining Shuttle requires mining access to use
2017-09-24 11:33:21 -04:00
LetterJay
51b44c1726
Merge pull request #2921 from Citadel-Station-13/upstream-merge-30593
...
[MIRROR] Rare Spider Variants!
2017-09-24 09:34:52 -04:00
ktccd
c8aeec815a
Adds sanitation to flavor_text ( #2926 )
...
Exactly what it sounds like. Boy, my security skills are shit, for
someone who's supposed to be studying exactly this shit at uni, isn't
it?
2017-09-24 03:15:02 -05:00
Jordan Brown
4670aeb42b
Makes a flags var use NONE instead of 0
2017-09-24 01:59:51 -05:00
Armhulen
2f64e2099f
Rare Spider Variants! ( #30593 )
...
* vipers use venom, tarantulas are fat and slow.
* viper!
added!
* tarantula!
done!
* tarantulas are big guys
nobody pushin them round
* added maidwives, added spider channel
* me and cobby lose our minds over shitcode 2
electric boogaloo
* midwives have skins
shiny
* YES XHUIS GOT IT WORKING WHAT A GUY YEAAAAAAAAAAA
WOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOOO
* new nurse sprite is in!
yay
* cosby joke about all my shit corrupting idk
this is gonna be annoying to fix
* Revert "cosby joke about all my shit corrupting idk"
This reverts commit 680b4c310e0b882f7465129c093e7f69fdff15c6.
* starts to add spidervenom, finishing tomorrow
* fuck god dammit shit fuck
* WE ARE BACK IN BIZNIZ TY ORANGES
* whoops
* feed me semour feed me all night long
fixes the cyberboss stuff except that complicated one i'll do something else with it for now
* temporary fix maybe
* lets just have this for now and i'll fix this later
* all good
* fixes
* does what i should have done a long time ago
* SKINS SKINS SKINS PULLAPALOOZA
* i think this does it okay
* spiders miright
* merge conflict fix?
* MISTAKES WERE MADE
* spider commands are cool now
* he protec
but he also attac
* ty joan
* ty joan again
2017-09-23 16:18:43 -05:00
LetterJay
95e614f4b7
Merge pull request #2917 from Citadel-Station-13/upstream-merge-30956
...
[MIRROR] Fixes revolutionary deconversion messages and logging
2017-09-23 16:45:53 -04:00
LetterJay
67c3dc63e1
Update ballistic.dm
2017-09-23 13:52:55 -05:00
LetterJay
cddcd82840
Update login.dm
2017-09-23 13:52:29 -05:00
