CitadelStationBot
772299445e
Makes the Ark of the Clockwork Justicar much more fancy
2017-08-20 19:55:15 -05:00
LetterJay
0ffaf66d1f
Merge branch 'master' into upstream-merge-29690
2017-08-15 19:18:22 -05:00
LetterJay
ab27b63cf9
Merge branch 'master' into upstream-merge-29611
2017-08-15 18:55:12 -05:00
LetterJay
69bf7e42cf
Merge branch 'master' into upstream-merge-29288
2017-08-14 18:35:28 -05:00
CitadelStationBot
bd35823012
[ready]Makes bIcon better
2017-08-13 17:41:12 -05:00
LetterJay
7b371b02e3
Merge pull request #2306 from Citadel-Station-13/upstream-merge-29756
...
[MIRROR] Oocky in icky descriptions
2017-08-09 02:21:38 -05:00
LetterJay
f68287e31e
Merge pull request #2305 from Citadel-Station-13/upstream-merge-29766
...
[MIRROR] Belligerent now has a visible indicator
2017-08-09 02:20:51 -05:00
CitadelStationBot
cc7ad81f79
Adds helpers to avoid << use
2017-08-08 22:28:16 -05:00
CitadelStationBot
fcd1a2dc86
Oocky in icky descriptions
2017-08-08 09:05:58 -05:00
CitadelStationBot
fb86e03544
Belligerent now has a visible indicator
2017-08-08 09:05:54 -05:00
CitadelStationBot
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
CitadelStationBot
1b2efdcc1d
More Initialize() garbage
2017-08-06 18:02:51 -05:00
CitadelStationBot
8ca4b9d614
Clockcult Combat Rebalance + Conversion Rework ( #2020 )
...
* Removes Soul Vessel, Cogscarab, and Anima Fragment Scriptures
* Update tips.txt
* no one cares
* manual clockcult syn
2017-08-04 11:46:22 -07:00
CitadelStationBot
70826963dd
Tweaked SM overlay ( #2243 )
2017-08-04 08:43:02 -07:00
CitadelStationBot
ef715b7837
Removes all checks for subsystem existence ( #2252 )
2017-08-04 08:41:52 -07: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
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
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
CitadelStationBot
79e6963aca
Hallucinations 3.0
2017-07-30 19:58:28 -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
adc7a52b8d
BYPASSES THE DEEP FREEZE ( #2168 )
2017-07-28 23:51:24 -07:00
CitadelStationBot
0f23a00e40
Cleaned up some turf decals, fixed beach away mission ( #2152 )
2017-07-26 22:56:55 -07:00
CitadelStationBot
147bd4cf97
Lava is no longer a plating subtype ( #2138 )
2017-07-26 00:05:53 -07:00
CitadelStationBot
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
CitadelStationBot
54da14ea6b
Rename Bumped to CollidedWith ( #2017 )
2017-07-15 11:44:12 -07:00
kevinz000
44742cb115
im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" ( #2025 )
...
* Revert "Automatic changelog generation for PR #2021 [ci skip]"
This reverts commit 9d0cd37dd3#2021 )"
This reverts commit f2ac487927
2017-07-15 11:41:36 -07:00
CitadelStationBot
f2ac487927
Disease Refactor ( #2021 )
2017-07-15 11:40:49 -07:00
CitadelStationBot
2d3905457e
[MIRROR] Rename Bump to Collide ( #2002 )
...
* Rename Bump to Collide
* Delete bubblegum.dm.rej
* Update bubblegum.dm
2017-07-14 21:35:56 -07:00
LetterJay
9d3c4d4702
Merge pull request #1989 from Citadel-Station-13/upstream-merge-29215
...
[MIRROR] Replaces ex_act and emp_act numbers with defines
2017-07-13 23:57:35 -05:00
CitadelStationBot
55462ed7d1
Replaces ex_act and emp_act numbers with defines
2017-07-13 17:46:41 -05:00
CitadelStationBot
1da785ffb5
Removes old height parameter from CanPass proc
2017-07-13 17:46:36 -05:00
CitadelStationBot
ff6bbbedf5
Changes some 1s and 0s to TRUE and FALSE ( #1967 )
2017-07-10 16:13:16 -07:00
CitadelStationBot
1b70c06474
Renames GLOB.cardinal to GLOB.cardinals to match GLOB.diagonals and GLOB.alldirs ( #1970 )
2017-07-10 16:10:42 -07:00
CitadelStationBot
90c2a4f867
Removes now-unnecessary obj_integrity definitions
2017-07-09 19:44:48 -05:00
CitadelStationBot
a101497539
Warp cubes are slightly less instant but way cooler
2017-07-06 20:12:38 -05:00
CitadelStationBot
4796ede787
Adds Necropolis curses for cursed items in Necropolis ruins
2017-07-06 10:15:09 -05:00
Poojawa
b1b4826c0c
July 5th TG sync ( #1883 )
...
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay
1054100178
Merge pull request #1447 from Citadel-Station-13/upstream-merge-28108
...
[MIRROR] Renamed Volt Void to Volt Blaster and removed it consuming and scaling with power
2017-07-03 17:46:37 -05:00
LetterJay
196db74cbe
Merge pull request #1714 from Citadel-Station-13/upstream-merge-28588
...
[MIRROR] Changes to the Atmos Watertank Backpack
2017-06-27 22:59:32 -05:00
CitadelStationBot
04dd1ffdbd
Fixes resin attack message
2017-06-26 06:03:44 -05:00
LetterJay
d04001c09d
another huge sync
2017-06-21 18:00:00 -05:00
CitadelStationBot
bac0b96000
Changes to the Atmos Watertank Backpack
2017-06-20 20:49:11 -05:00
LetterJay
42368581c5
Merge branch 'master' into upstream-merge-26965
2017-06-19 15:39:01 -05:00
CitadelStationBot
a090e33a15
Adds Prolonging Prism as an application scripture ( #1472 )
2017-06-17 13:31:04 -07:00
LetterJay
813bcc2b8d
commit
2017-06-14 11:16:54 -05:00
CitadelStationBot
5db49fb44b
Last Cult Master Spell: Eldritch Pulse & Various Tweaks ( #1430 )
2017-06-13 13:48:36 -07:00
CitadelStationBot
fb40986f89
Fixes basic spiderlings becoming ice spiders
2017-06-10 12:22:48 -05:00
LetterJay
7189249f66
Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115
...
[MIRROR] A large and unasked for repath and improvement of accessories (formerly ties, but actually armbands and medals)
2017-06-10 09:01:25 -05:00
