Commit Graph

173 Commits

Author SHA1 Message Date
KorPhaeron
3e26e09db8 ismecha define 2017-10-02 01:04:53 -05:00
LetterJay
018300507a Merge pull request #3050 from Citadel-Station-13/upstream-merge-31162
[MIRROR] Fixes plasma cutters only hitting one tile
2017-10-01 16:32:24 -04:00
LetterJay
f0379ec3f3 Merge pull request #3042 from Citadel-Station-13/upstream-merge-30605
[MIRROR] You can now examine an airlock to find out how to construct/deconstruct it
2017-10-01 16:30:40 -04:00
kevinz000
b13f2012fb Update closed.dm 2017-10-01 08:42:26 -05:00
LetterJay
81e40cc5c8 Merge pull request #2981 from Citadel-Station-13/upstream-merge-30763
[MIRROR] Configuration datum refactor
2017-10-01 02:50:17 -04:00
LetterJay
f55c86edfb Merge branch 'master' into upstream-merge-31045 2017-10-01 01:17:52 -04:00
kingofkosmos
0f387451f7 You can now examine an airlock to find out how to construct/deconstruct it (#30605)
* Tweaks rwall construction examine-messages.

* Tweaks window construction examine-messages.

* Added airlock construction examine messages.

* Typo fix.

* Shortened the airlock electronics circuit message.

* Fixed examine text styles.

* Fixes.

* Fixed wall-examine showing on rwalls.

* Made wall and rwall decon hints into a proc. Probably overrode the examine() wrong.

* I missed a > in span. Reinforced falsewall now deconstructs with wirecutters and looks like a real rwall. Changed to a more classy istype-check.

* New reinforced fakewall examine- and attackby-subtypes to get rid of if-istype-reinforced-checks.

* Removed unnecessary rwall-examine.

* Sound full path.
2017-10-01 00:04:14 -05:00
LetterJay
04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
LetterJay
6d59f3b06f Update misc_walls.dm 2017-09-30 14:19:40 -05:00
LetterJay
b88081e106 Update misc_floor.dm 2017-09-30 14:19:27 -05:00
LetterJay
47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
LetterJay
781b0359ae Merge pull request #2993 from Citadel-Station-13/upstream-merge-30714
[MIRROR] Shooting walls can create bullet holes/dents
2017-09-29 01:44:54 -04:00
Joan Lung
e4b4860e44 Reebe is fancier now 2017-09-28 21:59:05 -05:00
KorPhaeron
bdae94f60c Shooting walls can create bullet holes/dents (#30714)
* Bullet holes in walls

* Code standards, new sprite
2017-09-28 21:48:27 -05:00
Jordan Brown
e5ef3d2405 Configuration datum refactor 2017-09-28 21:37:53 -05:00
Emmett Gaines
16f1ceedd1 GetAllContents performance increase (#31027) 2017-09-28 10:44:28 -05:00
Ashe Higgs
e575bd6685 (Ready) Clockwork Cult Rework: Proof-of-concept 2017-09-26 15:22:09 -05:00
vuonojenmustaturska
11a3395690 Tiny batch of Initialize() fixes, mostly stuff that isn't around at roundstart 2017-09-24 17:42:13 -05:00
CitadelStationBot
2a860d1954 [MIRROR] More Initialize() fixes, requires someone to test with DB (#2857)
* More Initialize() fixes, requires someone to test with DB

* fucking mirror failure
2017-09-22 23:35:22 -05:00
CitadelStationBot
597c02135a [MIRROR] Maybe fix shuttle issues (#2841)
* Merge pull request #30819 from MrStonedOne/patch-425

Maybe fix shuttle issues

* Maybe fix shuttle issues
2017-09-17 21:35:42 -05:00
CitadelStationBot
69c1d74f65 [MIRROR] Corrects killroom turf gas mixture (#2805)
* Corrects killroom turf gas mixture

* Corrects killroom turf gas mixture
2017-09-17 12:00:59 -05:00
CitadelStationBot
768c90fc03 [MIRROR] Removes vine floors and their sprite (#2807)
* Removes vine floors and their sprite (#30778)

* removes vine floors and their sprite

* Once more, with feeling

* Revert "Merge branch 'kudzufix' of https://github.com/vuonojenmustaturska/tgstation into kudzufix"

This reverts commit 89d99caa75dcadabebdf44a6e4b6c40b2914156a, reversing
changes made to 92e89ed02b767b927a83ee3a878b6eb38f590c5c.

* Removes vine floors and their sprite
2017-09-17 12:00:19 -05:00
CitadelStationBot
79ae8d8829 [MIRROR] Ports chasm exceptions to typecaches (#2777)
* Ports chasm exceptions to typecaches (#30717)

* Ports chasm exceptions to typecaches

* Ports chasm exceptions to typecaches
2017-09-15 03:24:57 -05:00
CitadelStationBot
3516f4ef0a [MIRROR] turf now checks for inheritance, this is the future! (#2770)
* Turfs call ..() in attackby (#30707)

* gg

* fixes that other issue

* ok

* okie dokie

* removes this devil

* ok this works

* ok this works

* turf now checks for inheritance, this is the future!
2017-09-14 13:18:01 -05:00
CitadelStationBot
82861d208b [MIRROR] Fixes lighting hard deleting (#2760)
* Fixes lighting hard deleting (#30684)

* Fixes lighting hard deleting
2017-09-14 06:44:17 -05:00
CitadelStationBot
4da91bc330 [MIRROR] Fixes Archaeology not working (#2744)
* Fixes Archaeology not working (#30547)

* gg

* fixes that other issue

* ok

* okie dokie

* removes this devil

* Fixes Archaeology not working
2017-09-13 16:53:30 -05:00
Joan Lung
2dc3868949 Makes shiny versions of lavaland monsters slightly more distinct (#30502)
* Makes shiny versions of lavaland monsters slightly more distinct

* classic

* lower drop

* tweak drops

* this is kind of absurd
2017-09-11 20:54:55 -05:00
LetterJay
01920e5fea Merge pull request #2661 from Citadel-Station-13/upstream-merge-30220
[MIRROR] Adds Archaeology Component
2017-09-11 15:22:59 -05:00
ExcessiveUseOfCobblestone
33f36fd0de Adds Archaeology Component 2017-09-08 10:02:01 -05:00
tortellinitony
d73b82cf11 Gets rid of manual overlay manipulation 2017-09-06 23:39:08 -05:00
LetterJay
92e055be97 Quick sync (#2587)
* sync since the mirror was down

* fucking byond

* can't forget these
2017-09-04 04:38:49 -05:00
CitadelStationBot
e70b6ceb33 Chasms will alert mobs below them when they form 2017-08-30 17:06:38 -05:00
kevinz000
44c3aecb3b Merge pull request #2549 2017-08-29 22:38:57 -07:00
kevinz000
f982cd1d5a Merge pull request #2550 2017-08-29 22:38:54 -07:00
kevinz000
0f37872fb5 Merge pull request #2463 2017-08-29 22:27:27 -07:00
kevinz000
9cb65df70d Merge pull request #2426 2017-08-29 22:27:21 -07:00
kevinz000
5c7b743cfa Merge pull request #2405 2017-08-29 22:27:10 -07:00
kevinz000
408acdd66d sync 2017-08-29 22:05:16 -07:00
kevinz000
175224c5de Merge branch 'master' into upstream-merge-29859 2017-08-29 21:14:45 -07:00
kevinz000
b9c58a2914 wew 2017-08-29 21:14:33 -07:00
kevinz000
4faa0d6104 Merge branch 'master' into upstream-merge-30244 2017-08-29 20:06:07 -07:00
CitadelStationBot
719717934c Makes the singularity eat asteroids, adds a planetary z-level list with a helper that adds maps to it 2017-08-29 17:10:59 -05:00
CitadelStationBot
4dc8a1adbc Workaround to prevent slippery components from flooding SSgarbage 2017-08-29 17:09:53 -05:00
kevinz000
911e1fa194 sync 2017-08-29 09:43:10 -07:00
kevinz000
301a581e64 sync 2017-08-29 09:41:11 -07:00
LetterJay
6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
LetterJay
27750d91d6 Merge pull request #2529 from Citadel-Station-13/upstream-merge-30214
[MIRROR] Removes the suppose-to-be unused shuttle wall path
2017-08-28 09:01:47 -05:00
CitadelStationBot
12ff0e7406 Removes the suppose-to-be unused shuttle wall path 2017-08-28 02:20:45 -05:00
CitadelStationBot
0a4efdcc8f Switched dirtystation to use typecaches for checks 2017-08-28 02:20:06 -05:00
CitadelStationBot
94429bdccc Cleaned up environment_smash vars with bitflag defines (#2515) 2017-08-27 05:55:07 -07:00