Commit Graph

4040 Commits

Author SHA1 Message Date
CitadelStationBot
2d48a0cf50 [MIRROR] Makes borg modules and human species easily spawnable by admins from the mob spawn menu. (#2967)
* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.

* Makes borg modules and human species easily spawnable by admins from the mob spawn menu.
2017-09-28 05:59:57 -07:00
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
64ff719843 Merge pull request #2956 from Citadel-Station-13/upstream-merge-30942
[MIRROR] Adds installing cells as part of mech construction and fixes some mech construction bugs.
2017-09-27 23:45:50 -04: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
f3da8a48a0 Update critter.dm 2017-09-27 19:11:11 -05:00
LetterJay
1ea098b805 Update pod.dm 2017-09-27 19:10:48 -05:00
LetterJay
68f3b5e719 Update time.dm 2017-09-27 19:10:26 -05:00
LetterJay
31a9164362 Update combat.dm 2017-09-27 16:27:21 -05:00
LetterJay
aa74660722 Update construction_datum.dm 2017-09-27 16:27:09 -05:00
LetterJay
69fa79f974 Update ticker.dm 2017-09-27 15:33:42 -05: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
0387f81ed5 Update ticker.dm 2017-09-27 15:16:05 -05: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
LetterJay
d2149124b7 Update mobs.dm 2017-09-27 15:10:01 -05:00
AnturK
ebdea5382b Here it is. 2017-09-27 13:22:16 -05:00
LetterJay
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
GLACoding
7b3fa9bdb1 Adds installing cells as part of mech construction and fixes some mech construction bugs. 2017-09-27 04:14:22 -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
Jordan Brown
af7dafd383 Some names -> string 2017-09-26 16:00:59 -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
26f0af19e0 update 2017-09-26 00:00:07 -05:00
LetterJay
e878e75c42 donator item 2017-09-25 23:49:06 -05:00
LetterJay
9a960678f1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-09-25 19:56:45 -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
8140b2647a Update mind.dm 2017-09-25 12:26:26 -05:00