Commit Graph
5765 Commits
Author SHA1 Message Date
deathride58 bf3644d64e adds points objective for cargonians 2017-09-28 19:41:13 -04:00
deathride58 de15e8fa6b Fixes reporter objective 2017-09-28 19:08:35 -04:00
deathride58 3711461873 makes the nukedisk objective exclusive to captain 2017-09-28 01:32:58 -04:00
deathride58 226ad9ddde adjustments 2017-09-28 01:10:42 -04:00
deathride58 43574eefe1 adds chaplain and curator objectives 2017-09-28 00:30:38 -04:00
deathride58 9bdc80ba82 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into crewobjectivesandmiscreants 2017-09-27 23:44:22 -04:00
LetterJayandGitHub d8de375ada Merge pull request #2936 from Citadel-Station-13/upstream-merge-30969
[MIRROR] DisplayTimeText mk2
2017-09-27 23:39:03 -04:00
LetterJayandGitHub f3da8a48a0 Update critter.dm 2017-09-27 19:11:11 -05:00
LetterJayandGitHub 1ea098b805 Update pod.dm 2017-09-27 19:10:48 -05:00
LetterJayandGitHub 68f3b5e719 Update time.dm 2017-09-27 19:10:26 -05:00
LetterJayandGitHub 50f139eb8d Merge pull request #2937 from Citadel-Station-13/upstream-merge-30995
[MIRROR] Map fixes
2017-09-27 20:08:54 -04:00
LetterJayandGitHub 18545eb41c Merge pull request #2935 from Citadel-Station-13/upstream-merge-30893
[MIRROR] Datum abductors refactor
2017-09-27 16:31:53 -04:00
LetterJayandGitHub 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
CitadelStationBot e58d05202b Automatic changelog generation for PR #2918 [ci skip] 2017-09-27 15:31:26 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 2e133c0b2c Update ears.dm 2017-09-27 15:12:22 -05:00
LetterJayandGitHub 2163132c52 Update ballistic.dm 2017-09-27 15:10:59 -05:00
LetterJayandGitHub d2149124b7 Update mobs.dm 2017-09-27 15:10:01 -05:00
LetterJayandGitHub 526c038f5d Merge pull request #2959 from Citadel-Station-13/upstream-merge-31036
[MIRROR] Fixes a thing.
2017-09-27 15:34:30 -04:00
CitadelStationBot d749cc4924 Fixes a thing. 2017-09-27 13:22:16 -05:00
AnturKandCitadelStationBot ebdea5382b Here it is. 2017-09-27 13:22:16 -05:00
CitadelStationBot bc0868983a Automatic changelog generation for PR #2953 [ci skip] 2017-09-27 11:49:50 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
CitadelStationBot 65bcd10223 Fixes MMI to AI law transfer 2017-09-26 16:52:17 -05:00
vuonojenmustaturskaandCitadelStationBot 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
CitadelStationBot e9b8e162e6 Some strings -> name var 2017-09-26 16:00:59 -05:00
Jordan BrownandCitadelStationBot af7dafd383 Some names -> string 2017-09-26 16:00:59 -05:00
LetterJayandGitHub 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
LetterJayandGitHub dab03b249d Merge pull request #2948 from Citadel-Station-13/upstream-merge-30992
[MIRROR] Spiderpalooza 1: Foods!
2017-09-26 15:01:02 -04:00
CitadelStationBot 5727a5873a Automatic changelog generation for PR #2947 [ci skip] 2017-09-26 14:00:47 -05:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
CitadelStationBot 8aa7a15b88 Automatic changelog generation for PR #2942 [ci skip] 2017-09-26 13:59:23 -05:00
LetterJayandGitHub 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
CitadelStationBot 14916124b5 Automatic changelog generation for PR #2940 [ci skip] 2017-09-26 13:58:59 -05:00
LetterJayandGitHub 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
CitadelStationBot 67f7ce5084 Automatic changelog generation for PR #2939 [ci skip] 2017-09-26 13:58:25 -05:00
LetterJayandGitHub 47a8ce6ae8 Merge pull request #2939 from Citadel-Station-13/upstream-merge-30863
[MIRROR] Bluespace pipes
2017-09-26 14:58:23 -04:00
CitadelStationBot 8ecba65f88 Fixes alium leap exploit 2017-09-26 13:54:26 -05:00
ShizCalevandCitadelStationBot 4bab4181f2 Fixes alium leap exploit 2017-09-26 13:54:26 -05:00
ArmhulenandCitadelStationBot a7d0b50808 Spiderpalooza 1: Foods! 2017-09-26 11:32:36 -05:00
CitadelStationBot f7d50cf44b Adds two more IMPORANT color burger colors 2017-09-26 08:52:28 -05:00
jughuandCitadelStationBot 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
CitadelStationBot 109b72bd74 Fixes missing Href tokens 2017-09-26 07:27:49 -05:00
Jordan BrownandCitadelStationBot 41276ce631 Fixes missing Href tokens (#30987)
* Fixes missing Href tokens

* Add missing form field. Fixes #30986
2017-09-26 07:27:49 -05:00
CitadelStationBot bf233f6b8e fixes shuttles creating duplicate areas 2017-09-26 07:26:37 -05:00
Emmett GainesandCitadelStationBot 2610101820 fixes shuttles creating duplicate area types (#31008) 2017-09-26 07:26:37 -05:00
kevinz000andCactus 2612f2b9cf Update beam_rifle.dm (#2943) 2017-09-26 07:54:30 -04:00