CitadelStationBot
dd22c79678
Completes major inhand split project ( #2178 )
2017-08-02 06:30:33 -05:00
LetterJay
5734a2c7ed
Merge pull request #2222 from Citadel-Station-13/upstream-merge-29610
...
[MIRROR] Fixes devil pitchforks being uninitialized
2017-08-02 06:06:33 -05:00
CitadelStationBot
b0cf9356b7
Combine the two changeturf procs into one
2017-08-02 05:20:12 -05:00
CitadelStationBot
8a4ddbe8a8
[MIRROR] Ports Rapid Cable Layers from /vg/ and paradise ( #2162 )
...
* Ports Rapid Cable Layers from /vg/ and paradise
* rej clean up + manual sync
* maps and .rej file cleanup
* sprite and WGW memes
* actual spellchecked memes
* some other map fix memes
* fuck it, let's just hard sync maps
* dumb paperwork shit for maps
* Revert "dumb paperwork shit for maps"
This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.
* *autistic screeching*
* REEEEEEEEEEEEEEEEEEEEE
* Fuck off I want to do something else
2017-08-02 04:56:44 -05:00
CitadelStationBot
76f7fcef9a
[MIRROR] Cleaned up paper varedits + tidied up paths ( #2156 )
...
* Cleaned up paper varedits + tidied up paths
* work smarter, not harder
* citadel snowflake
* Update uplink_item_cit.dm
2017-08-02 03:17:32 -05:00
CitadelStationBot
1e82ad9d3e
Fixes devil pitchforks being uninitialized
2017-08-01 17:57:44 -05:00
CitadelStationBot
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05:00
kevinz000
bbcad2fa58
Proper mirror PR for the disease refactor because I fucked up the first one. ( #2026 )
...
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025 )"
This reverts commit 44742cb115
2017-07-31 23:41:22 -07:00
ktccd
608737376b
Borer admin refactor ( #2209 )
...
* Refactors and clarifications
Refactors borers to use objective datums instead of relying entirely on
hardcoded snowflake bullshit.
Also adds some FEEDBACK to the punishments, so the host isn't completely
confused why they suddenly keep getting stunlocked and blinded.
Also refactors syndi-borers to display their objectives along the other
borers instead of as an antag, since they TECHNICALLY count as a borer
for their escape objective, enabling them to cooperate.
Refactors borers weakness-chemical to be a variable instead of
hardcoded, allowing admin var-editing to work.
Borers now inherit the objectives of their parent-borer. Normally makes
no difference, but if admins were to give custom objectives to one
borer, then all its children will injerit it.
* Removed a line
Removed a piece of text that was redundant at best and incorrect at
worst. Syndicate borers makes it show up as the default 10 needed when
no other borers existed and normal borers already state their own
objective individually.
2017-07-31 21:45:32 -07:00
ktccd
4c7f288341
Adds a HUD for borers ( #2211 )
...
Borers with minds are added to the HUD and can see the HUD.
Humans with a borer are added to the HUD, but CANNOT see the HUD.
If the borer leaves, the human is removed from the HUD.
2017-07-31 21:45:00 -07:00
LetterJay
e8ae703c16
Update turf.dm
2017-07-31 18:15:16 -05:00
LetterJay
576ef2510c
Merge branch 'master' into upstream-merge-29367
2017-07-31 17:19:31 -05:00
ktccd
a2f92461a4
Merge pull request #2210 from Citadel-Station-13/upstream-merge-29585
...
[MIRROR] Improves several Sound Loops' Performance
2017-07-31 22:06:17 +02:00
ktccd
3083ad7aa0
Merge pull request #2205 from Citadel-Station-13/upstream-merge-29581
...
[MIRROR] Corrected holding cell access requirements
2017-07-31 22:05:09 +02:00
ktccd
a6e74b9a27
Merge pull request #2193 from Citadel-Station-13/upstream-merge-29572
...
[MIRROR] Removes a rogue period from the sliver theft objective
2017-07-31 21:51:42 +02:00
CitadelStationBot
3d53f888b1
Improves several Sound Loops' Performance
2017-07-31 14:35:16 -05:00
CitadelStationBot
4ac6b49871
Corrected holding cell access requirements
2017-07-31 08:58:05 -05:00
LetterJay
62d7f47497
Merge pull request #2170 from Citadel-Station-13/upstream-merge-29455
...
[MIRROR] Adds 3D Sound System
2017-07-31 03:43:20 -05:00
LetterJay
35fba1933e
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
...
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
LetterJay
40216683e0
Update gibspawner.dm
2017-07-30 23:26:16 -05:00
LetterJay
feeb6cdd8b
Update game_mode.dm
2017-07-30 23:24:59 -05:00
LetterJay
77c67b31c6
Merge pull request #2064 from Citadel-Station-13/upstream-merge-29290
...
[MIRROR] Unwrenching clockwork structures no longer damages them
2017-07-30 23:14:39 -05:00
LetterJay
05f7040d12
Merge pull request #2155 from Citadel-Station-13/kevinz000-patch-4
...
REEEEEE USE YOUR TRUE/FALSE DEFINES KTCCD
2017-07-30 23:13:42 -05:00
CitadelStationBot
a98322d497
Removes a rogue period from the sliver theft objective
2017-07-30 19:58:11 -05:00
LetterJay
0ac85c6756
Update sound.dm
2017-07-30 14:43:35 -05:00
CitadelStationBot
5da5e58ee5
Fixes a lot of eye damage procs
2017-07-30 08:16:38 -05:00
LetterJay
70a5aed428
Merge pull request #2054 from Citadel-Station-13/upstream-merge-28977
...
[MIRROR] Augment Styles/Changes
2017-07-29 23:56:52 -05:00
LetterJay
0e131b50e5
Merge pull request #2188 from Citadel-Station-13/upstream-merge-29546
...
[MIRROR] Grammar fix for revenants
2017-07-29 23:55:51 -05:00
CitadelStationBot
f9a6ee8d76
Give c4 correct plastic_overlay ( #2183 )
2017-07-29 19:51:38 -07:00
CitadelStationBot
272414bd30
Fixes latejoin antagonist exploit ( #2181 )
2017-07-29 19:51:16 -07:00
CitadelStationBot
6990dcbceb
Grammar fix for revenants
2017-07-29 21:03:12 -05:00
LetterJay
d07b21a9d8
Merge pull request #2174 from Citadel-Station-13/upstream-merge-29325
...
[MIRROR] Prolonging Prisms have a higher cost to delay, but no longer increase in cost based off of CV
2017-07-29 15:47:48 -05:00
CitadelStationBot
d16f68b4da
Sigils of Transmission can now drain power, but Interdiction Lenses have been removed ( #2173 )
2017-07-28 23:52:02 -07:00
CitadelStationBot
9d7820a81c
Fixes two consistency/grammar issues ( #2161 )
2017-07-28 23:51:36 -07:00
CitadelStationBot
adc7a52b8d
BYPASSES THE DEEP FREEZE ( #2168 )
2017-07-28 23:51:24 -07:00
CitadelStationBot
30cb54a928
Prolonging Prisms have a higher cost to delay, but no longer increase in cost based off of CV
2017-07-28 18:45:22 -05:00
CitadelStationBot
3db9c9ddb7
Adds 3D Sound System
2017-07-28 09:02:21 -05:00
CitadelStationBot
269e2cbd64
Removes the dangerrating variable, which is completely unused ( #2157 )
2017-07-27 06:44:35 -07:00
kevinz000
b2e176346c
Update cit_objectives.dm
2017-07-27 05:29:27 -07: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
0f23a00e40
Cleaned up some turf decals, fixed beach away mission ( #2152 )
2017-07-26 22:56:55 -07:00
CitadelStationBot
9ac752afb4
Makes chemical payload bomb cores less misleading ( #2151 )
2017-07-26 22:56:27 -07: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
66cf0b674d
Fix ruin ripley's spawn equipment ( #2128 )
2017-07-25 15:34:36 -07:00
CitadelStationBot
3ede530307
Romerol zombies count as dead for assassinate and maroon objectives. ( #2130 )
2017-07-25 15:34:18 -07:00
CitadelStationBot
47e20105a3
fixes instruments ( #2129 )
2017-07-25 15:33:45 -07:00
CitadelStationBot
b998e14a5b
Map Spellcheck
2017-07-24 21:16:46 -05:00
CitadelStationBot
37b9e24bc0
Removes the gulag sink and water bottles from the sustenance vendor. ( #2094 )
2017-07-24 04:08:56 -07:00
CitadelStationBot
5f8da9c34b
Prevents the captain's sabre from rustling jimmies ( #2113 )
2017-07-24 04:08:41 -07:00
