Commit Graph

4055 Commits

Author SHA1 Message Date
kevinz000
724fa8ce54 [READY]Refactors timestops to use fields (#30858)
* kek

* fixes

* Fixes

* fixes

* throw freeze

* woops

* double woops
2017-09-28 21:46:34 -05:00
LetterJay
d25894447e Merge pull request #2971 from Citadel-Station-13/upstream-merge-31048
[MIRROR] Fixed duplicate definition
2017-09-28 12:32:57 -04:00
LetterJay
207e7d8f71 Merge pull request #2970 from Citadel-Station-13/upstream-merge-31042
[MIRROR] Fixes SSqueak/Initialize() not returning ..()
2017-09-28 12:29:22 -04:00
LetterJay
3e27458d11 Merge pull request #2968 from Augustfox/master
Organize hair and facial hair in character creation
2017-09-28 12:29:10 -04:00
LetterJay
4e19b5a5f8 Merge pull request #2969 from Citadel-Station-13/upstream-merge-31041
[MIRROR] Removes some spawns
2017-09-28 12:25:33 -04:00
LetterJay
e6356d2560 Merge pull request #2955 from Citadel-Station-13/upstream-merge-31020
[MIRROR] Variants will not be spawned by gold cores
2017-09-28 12:22:44 -04:00
LetterJay
b2682b401c Merge pull request #2963 from Citadel-Station-13/upstream-merge-31035
[MIRROR] Makes the mining vendor give more verbose feedback
2017-09-28 12:22:10 -04:00
LetterJay
355b9af67e Merge pull request #2960 from Citadel-Station-13/upstream-merge-30957
[MIRROR] Revheads are now stealthier/harder to metagame
2017-09-28 12:21:53 -04:00
AutomaticFrenzy
91c1a78af9 Fixed duplicate definition (#31048) 2017-09-28 10:43:24 -05:00
Jordan Brown
659c92a0d6 Fixes SSqueak not returning ..() 2017-09-28 10:43:16 -05:00
Jordan Brown
97b8a6ed3b Removes some spawns 2017-09-28 10:43:07 -05:00
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
Augustfox
612707c999 Alphabetize hair and facial hair in char creation
🆑
Reordered hair in a semi-alphabetized list for easier use in character creation.
Alphabetized facial hair for easier use in character creation.
/🆑
No names or content changed other then order in list.
2017-09-27 23:45:15 -05: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
ShizCalev
9b2f07335a Makes the mining vendor give more verbose feedback 2017-09-27 15:45:19 -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
Robustin
f71c3d6614 Revheads are now stealthier/harder to metagame (#30957)
* stealthier revs

* Stealthiest Revheads

* Update revolution.dm
2017-09-27 15:28:35 -05: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
Armhulen
0aea66649e whoops we'll get right on that (#31020) 2017-09-27 00:45:49 -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