Commit Graph

1731 Commits

Author SHA1 Message Date
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
LetterJay
8b0b4f9e2a Merge pull request #3038 from Citadel-Station-13/upstream-merge-31132
[MIRROR] Fixes changelings being able to transform sting mobs that are transform sting immune
2017-10-01 16:29:13 -04:00
LetterJay
1057b4b636 Merge pull request #3035 from Citadel-Station-13/upstream-merge-31137
[MIRROR] Fixes meteors not working with multi z
2017-10-01 16:21:08 -04:00
LetterJay
40f541b9da Merge pull request #3031 from Citadel-Station-13/upstream-merge-31117
[MIRROR] Fixes liches losing spells
2017-10-01 15:42:12 -04:00
LetterJay
5ec781502c Merge branch 'master' into upstream-merge-31116 2017-10-01 15:09:10 -04:00
LetterJay
4e80c2574a Merge pull request #3023 from Citadel-Station-13/upstream-merge-31069
[MIRROR] Cleanup to various loc assignments and nearby code
2017-10-01 15:08:21 -04:00
LetterJay
490885a36f update 2017-10-01 13:02:52 -05:00
kevinz000
b13f2012fb Update closed.dm 2017-10-01 08:42:26 -05:00
LetterJay
926db45b54 Update world.dm 2017-10-01 03:06:11 -05:00
LetterJay
0ab234ceb0 Merge branch 'master' into upstream-merge-31000 2017-10-01 03:31:49 -04:00
LetterJay
f621fb704b Merge branch 'master' into upstream-merge-31069 2017-10-01 02:56:28 -04:00
LetterJay
b15f639621 Merge pull request #2985 from Citadel-Station-13/upstream-merge-30722
[MIRROR] Adds steal research levels objectives to traitors+lings, makes it work for everyone not just ninjas.
2017-10-01 02:51:56 -04: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
747312cb6d updates 2017-10-01 00:59:59 -05: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
11b558c367 Merge branch 'master' into upstream-merge-31093 2017-10-01 00:50:26 -04:00
Leo
57b2a3618e Merge pull request #31132 from KorPhaeron/lingfix
Fixes changelings being able to transform sting mobs that are transform sting immune
2017-09-30 21:36:32 -05:00
KorPhaeron
e53fd73557 Fixes meteors not working with multi z (#31137) 2017-09-30 21:33:06 -05:00
AnturK
6411e25110 Fixes liches losing spells 2017-09-30 14:54:02 -05:00
AnturK
6afd603fe6 Fixes some hardset dna misuse 2017-09-30 14:51:52 -05:00
LetterJay
04d071deda Merge branch 'master' into upstream-merge-30763 2017-09-30 15:30:46 -04:00
LetterJay
9e48311632 Update cloning.dm 2017-09-30 14:27:04 -05:00
LetterJay
07c95ef168 Update aifixer.dm 2017-09-30 14:26:41 -05:00
LetterJay
cc9e462988 Update camera_assembly.dm 2017-09-30 14:26:22 -05:00
LetterJay
410ca14e17 Update h_sandbox.dm 2017-09-30 14:25:58 -05:00
LetterJay
dddf85a7df Update bags.dm 2017-09-30 14:23:03 -05:00
LetterJay
fdb101596d Update bodybag.dm 2017-09-30 14:22:39 -05: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
825f05b3f9 Merge pull request #2962 from Citadel-Station-13/upstream-merge-31032
[MIRROR] Fixes doomsday not working with multiz stations
2017-09-30 15:17:14 -04:00
LetterJay
063a44281e Merge branch 'master' into upstream-merge-31044 2017-09-30 14:53:08 -04:00
LetterJay
b810f30e10 Update clockwork_slab.dm 2017-09-30 12:48:49 -05:00
LetterJay
47a65d829d Merge branch 'master' into upstream-merge-29741 2017-09-30 13:35:47 -04:00
LetterJay
f1858a3a63 Merge pull request #2996 from Citadel-Station-13/upstream-merge-30988
[MIRROR] Alt-clicking descriptions when examining
2017-09-30 12:57:52 -04:00
LetterJay
10b530920b Merge pull request #3015 from Citadel-Station-13/upstream-merge-31111
[MIRROR] Fixes SM shard extraction
2017-09-30 12:57:33 -04:00
LetterJay
73e7fb458c Merge pull request #3027 from Citadel-Station-13/upstream-merge-31123
[MIRROR] Fixes dresser being unattackable
2017-09-30 12:56:13 -04:00
LetterJay
99712e76e9 Merge pull request #3024 from Citadel-Station-13/upstream-merge-30873
[MIRROR] Paper markdown
2017-09-30 12:55:53 -04:00
AnturK
3ec5a637e5 Fixes dresser being unattackable (#31123) 2017-09-30 10:30:09 -05:00
nicbn
078128aa91 Paper markdown (#30873)
* why it doesn't work

* list thing

* oops

* fixes list. maybe

* Less regex

* wip

* Done I think. I think

* return your functions

* Replace $10 by $a
2017-09-30 08:11:01 -05:00
vuonojenmustaturska
98d6927eb6 Cleanup to various loc assignments and nearby code 2017-09-30 08:10:52 -05:00
oranges
384332fe20 Small refactor to movement (#31071)
You can now move an object into nullspace, which will call exited on
it's parent and parent area but will not call any entered.

Note that you cannot pass null into forceMove it will crash, instead use
the new proc that will call the underlying logic with a null destination

Some of the force move procs have been refactored to check that their
parent move succeeded before doing updates
2017-09-30 07:23:35 -05:00
LetterJay
b5cdb64a53 Update extinguisher.dm 2017-09-30 01:44:31 -05:00
LetterJay
e63f93979f Merge pull request #2979 from Citadel-Station-13/upstream-merge-30572
[MIRROR] Adds action buttons for spiders, refactors action code, nurse spiders can set a hereditary directive for their children to follow
2017-09-30 02:41:38 -04:00
LetterJay
be08e0c29f Update mirror.dm 2017-09-29 23:42:12 -05:00
LetterJay
7df3c80a39 Update cloning.dm 2017-09-29 23:41:44 -05:00
LetterJay
e515151610 Update h_sandbox.dm 2017-09-29 23:39:34 -05:00
ShizCalev
f8f599b17b Stops putting RCD, bluespace bags, and staves into ORM 2017-09-29 19:33:37 -05:00
ShizCalev
c54ea1b9bf Fixes SM shard extraction (#31111)
* Fixes SM shard extraction

* Space-OSHA called. They want to have a word.
2017-09-29 18:43:41 -05:00