Commit Graph

3856 Commits

Author SHA1 Message Date
kevinz000
b2e176346c Update cit_objectives.dm 2017-07-27 05:29:27 -07:00
CitadelStationBot
5872213462 Automatic changelog generation for PR #2140 [ci skip] 2017-07-27 07:28:00 -05:00
ktccd
c52f7a0475 Delayed objective (#2140)
Delayed objective [Latejoiners can now be selected as traitor targets]
2017-07-27 05:27:58 -07:00
CitadelStationBot
34eea1085b Automatic changelog generation for PR #2147 [ci skip] 2017-07-27 03:19:07 -05:00
LetterJay
6986c3bb91 PDA Icon Update (Again) (#2147) 2017-07-27 01:19:05 -07:00
CitadelStationBot
e085c33ac5 Makes narsie less huge (#2144) 2017-07-26 22:57:11 -07:00
CitadelStationBot
0f23a00e40 Cleaned up some turf decals, fixed beach away mission (#2152) 2017-07-26 22:56:55 -07:00
CitadelStationBot
7c65bae7ba Cleaned up doubled turf on omega (#2150) 2017-07-26 22:56:43 -07:00
CitadelStationBot
dc0507c7e0 Automatic changelog generation for PR #2151 [ci skip] 2017-07-27 00:56:29 -05:00
CitadelStationBot
9ac752afb4 Makes chemical payload bomb cores less misleading (#2151) 2017-07-26 22:56:27 -07:00
CitadelStationBot
7cdeae21a5 Moved abductor ships further apart (#2149) 2017-07-26 22:56:13 -07:00
CitadelStationBot
002b20a725 Automatic changelog generation for PR #2142 [ci skip] 2017-07-26 19:52:21 -05:00
LetterJay
471f9d064b Merge pull request #2142 from Citadel-Station-13/upstream-merge-29493
[MIRROR] Fixes guns staying zoomed in after being unequipped
2017-07-26 19:52:19 -05:00
LetterJay
2aacff25ad Merge pull request #2141 from Citadel-Station-13/upstream-merge-29495
[MIRROR] Portals do not go on supply shuttles
2017-07-26 19:52:03 -05:00
CitadelStationBot
33c9539d59 Automatic changelog generation for PR #2145 [ci skip] 2017-07-26 19:51:20 -05:00
LetterJay
71fe65008b Merge pull request #2145 from Citadel-Station-13/upstream-merge-29487
[MIRROR] Adds a mini fire extinguisher to janitor and service borgs
2017-07-26 19:51:18 -05:00
CitadelStationBot
4e6e4faed8 Adds a mini fire extinguisher to janitor and service borgs 2017-07-26 15:45:10 -05:00
CitadelStationBot
cc9330a2ec Fixes guns staying zoomed in after being unequipped 2017-07-26 15:44:54 -05:00
CitadelStationBot
c3329f1b84 Portals do not go on supply shuttles 2017-07-26 15:44:51 -05:00
CitadelStationBot
8a7aa6972d Automatic changelog generation for PR #2139 [ci skip] 2017-07-26 14:59:30 -05:00
LetterJay
e9cd005bf1 Merge pull request #2139 from Raeschen/Raes_moonman
Added "Goodbye moonmen" to lobby music selection
2017-07-26 14:59:28 -05:00
Raeschen
71bcd2e0f8 Added "Goodbye moonmen" to lobby music selection 2017-07-26 13:10:20 +01:00
CitadelStationBot
cf87bf20f5 makes gulag beacon indestructible (#2123) 2017-07-26 00:06:21 -07:00
CitadelStationBot
147bd4cf97 Lava is no longer a plating subtype (#2138) 2017-07-26 00:05:53 -07:00
CitadelStationBot
986549df26 Fixes global init linux bug by using proc typepath references, adds better error detection (#2137) 2017-07-26 00:05:10 -07:00
CitadelStationBot
770341fee0 Automatic changelog generation for PR #2135 [ci skip] 2017-07-26 02:05:01 -05:00
CitadelStationBot
d2e771c9f3 Adds cybernetic organs (#2135) 2017-07-26 00:04:59 -07:00
CitadelStationBot
556699d562 Fixes timer id collision (#2136) 2017-07-26 00:04:47 -07:00
CitadelStationBot
66cf0b674d Fix ruin ripley's spawn equipment (#2128) 2017-07-25 15:34:36 -07:00
CitadelStationBot
6e6b1884d4 Automatic changelog generation for PR #2131 [ci skip] 2017-07-25 17:34:28 -05:00
CitadelStationBot
d26fe6c877 Attacking yourself always hits the zone you're targeting (#2131) 2017-07-25 15:34:27 -07:00
CitadelStationBot
31a463875b Automatic changelog generation for PR #2130 [ci skip] 2017-07-25 17:34:19 -05:00
CitadelStationBot
3ede530307 Romerol zombies count as dead for assassinate and maroon objectives. (#2130) 2017-07-25 15:34:18 -07:00
CitadelStationBot
a5e2fe2047 Automatic changelog generation for PR #2132 [ci skip] 2017-07-25 17:34:06 -05:00
CitadelStationBot
f311198c86 Gives Nar-Sie a new summon sound (#2132) 2017-07-25 15:34:04 -07:00
CitadelStationBot
47e20105a3 fixes instruments (#2129) 2017-07-25 15:33:45 -07:00
CitadelStationBot
f8ad50f780 Automatic changelog generation for PR #2134 [ci skip] 2017-07-25 17:27:34 -05:00
ktccd
a91b3b0f19 Citadel chem fixes (#2134)
* Adds taste to citadel reagents

No longer will semen, femcum and the rest taste like [Generic Food],
instead they will taste like... stuff!
If you got a better description for this, I'd like to hear it. Except
making personalized tastes or food-dependent tastes is way beyond the
scope of this PR.

* Fucked up committing

Somehow this didn't follow the rest of the committ, somehow...
2017-07-25 15:27:33 -07:00
CitadelStationBot
97f4d7a085 Automatic changelog generation for PR #2133 [ci skip] 2017-07-25 17:27:22 -05:00
ktccd
e1ed61ef35 Fixes empty subtle emotes (#2133)
Makes the subtle emote not work if you try to use an empty emote string
OR if you cancel it early.
2017-07-25 15:27:20 -07:00
LetterJay
90e6170606 Merge pull request #2126 from Citadel-Station-13/upstream-merge-29457
[MIRROR] Adds logging of shuttle request reasons.
2017-07-25 12:57:10 -05:00
LetterJay
51846b1efd Merge pull request #2122 from Citadel-Station-13/upstream-merge-29485
[MIRROR] Map Spellcheck
2017-07-25 12:56:27 -05:00
LetterJay
c41c6891c0 Merge pull request #2121 from Citadel-Station-13/upstream-merge-29452
[MIRROR] cerestation grammar fix
2017-07-25 12:55:11 -05:00
CitadelStationBot
f6a6551428 Automatic changelog generation for PR #2120 [ci skip] 2017-07-25 12:54:57 -05:00
LetterJay
54067ea35c Merge pull request #2120 from Citadel-Station-13/upstream-merge-29302
[MIRROR] Adds more CAS cards. Removes a couple shit ones.
2017-07-25 12:54:56 -05:00
CitadelStationBot
03e116b971 Automatic changelog generation for PR #2119 [ci skip] 2017-07-25 12:54:37 -05:00
LetterJay
9a35b33aa3 Merge pull request #2119 from Citadel-Station-13/upstream-merge-29379
[MIRROR] You can now control-click action buttons to lock them in place
2017-07-25 12:54:34 -05:00
CitadelStationBot
ba0c60a697 Adds logging of shuttle request reasons. 2017-07-25 09:53:46 -05:00
CitadelStationBot
b998e14a5b Map Spellcheck 2017-07-24 21:16:46 -05:00
CitadelStationBot
32586afe69 cerestation grammar fix 2017-07-24 21:16:41 -05:00