Commit Graph

129 Commits

Author SHA1 Message Date
CitadelStationBot 943599c5f1 Clock powerdrain now works on any device with a powercell 2017-08-09 03:05:47 -05:00
CitadelStationBot fb86e03544 Belligerent now has a visible indicator 2017-08-08 09:05:54 -05:00
CitadelStationBot e80f1dba99 Fixes being able to "stomp out" sigils with telekinesis 2017-08-06 18:02:43 -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 dd22c79678 Completes major inhand split project (#2178) 2017-08-02 06:30:33 -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 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 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 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 147bd4cf97 Lava is no longer a plating subtype (#2138) 2017-07-26 00:05:53 -07:00
CitadelStationBot 79fcbfece6 Charging the clockwork slab now uses overlays 2017-07-19 10:57:09 -05:00
CitadelStationBot 88bef4f0c0 Unwrenching clockwork structures no longer damages them 2017-07-18 09:47:52 -05:00
CitadelStationBot a72962c300 Made some object lists less terrible to read 2017-07-18 09:44:43 -05:00
CitadelStationBot 74e5f80257 Fixes the Ark not pushing stuff away even while waiting for components 2017-07-17 07:16:55 -05:00
CitadelStationBot 54da14ea6b Rename Bumped to CollidedWith (#2017) 2017-07-15 11:44:12 -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
CitadelStationBot 7c4b887551 Clockwork component icons for tgui will only be generated once (#1995) 2017-07-14 03:21:13 -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 f893863397 [MIRROR] Refactors speech/communication logging and adds coordinates to speech logs (#1905)
* Refactors speech/communication logging and adds coordinates to speech logs

* Update clockwork_slab.dm

* Delete clockwork_slab.dm.rej

* Update browserOutput.dm

* Delete browserOutput.dm.rej
2017-07-13 06:37:51 -07:00
CitadelStationBot 059e1ad46b Replaces clockwork component initials with icons (#1971) 2017-07-10 16:14:11 -07: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 eb7f6c515b Cleans up posibrain code 2017-07-06 09:43:16 -05:00
Poojawa b1b4826c0c July 5th TG sync (#1883)
July 5th TG sync
2017-07-05 22:14:19 -05:00
LetterJay b75fee9f38 Merge branch 'master' into upstream-merge-28711 2017-07-03 17:47:00 -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 694bf7a641 Update clockwork_slab.dm 2017-07-03 14:09:59 -05:00
LetterJay 08fd496450 Update clockwork_slab.dm 2017-07-03 12:02:32 -05:00
CitadelStationBot 5882b25b7a Rewrites Recollection and splits it into categories, rewords Hierophant Network description 2017-07-03 10:10:17 -05:00
LetterJay d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
CitadelStationBot 989b991b05 Adds framework for equip delays and adds it to the straight jacket 2017-06-19 22:06:18 -05:00
LetterJay 42368581c5 Merge branch 'master' into upstream-merge-26965 2017-06-19 15:39:01 -05:00
CitadelStationBot 7ad1ab9f0f Ratvar is no longer stopped by pathetic windows 2017-06-17 22:11:36 -05:00
CitadelStationBot a090e33a15 Adds Prolonging Prism as an application scripture (#1472) 2017-06-17 13:31:04 -07:00
CitadelStationBot 9bd98194b2 Vomit fix 2017-06-16 15:19:26 -05:00
CitadelStationBot 3b5d55260a Fixes Geis counting dead servants 2017-06-15 19:55:41 -05:00
LetterJay 55d30f865b upstream-merge-28062 2017-06-12 12:20:07 -05:00
LetterJay 87ce1e1780 upstream-merge-28047 2017-06-11 08:39:38 -05:00
LetterJay f5f4e3a9d1 upstream-merge-28047 2017-06-11 08:26:09 -05:00
LetterJay 4386813269 upstream-merge-27996 2017-06-11 02:17:53 -05:00
LetterJay b80a184d97 up to upstream-merge-27868 2017-06-11 00:04:00 -05:00
LetterJay 06be53ffeb Merge pull request #1405 from Citadel-Station-13/upstream-merge-28049
[MIRROR] Only human and silicon servants can help recite multi-invoker scriptures
2017-06-09 09:13:18 -05:00
CitadelStationBot ff53afcd99 Fixes clockwork armor bitflags 2017-06-09 03:26:59 -05:00
CitadelStationBot d9e3699f88 Ports Goonchat 2017-06-08 16:27:56 -05:00
CitadelStationBot 92e3754bfb Renamed Volt Void to Volt Blaster and removed it consuming and scaling with power 2017-06-07 03:06:26 -05:00