LetterJay
6a8ca2e02c
Merge branch 'master' into upstream-merge-31037
2017-10-01 02:53:03 -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
ef96be641a
Merge pull request #2972 from Citadel-Station-13/upstream-merge-30856
...
[MIRROR] Adds Nars-Ian and clock hawks
2017-10-01 02:50:31 -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
8be007225b
Merge pull request #3007 from Citadel-Station-13/upstream-merge-31085
...
[MIRROR] Fixes shade attackby
2017-10-01 02:20:35 -04:00
LetterJay
1d1a862e1b
Merge pull request #3003 from Citadel-Station-13/upstream-merge-31045
...
[MIRROR] Reebe is fancier now
2017-10-01 02:20:23 -04:00
LetterJay
747312cb6d
updates
2017-10-01 00:59:59 -05:00
ninjanomnom
009532b907
for completeness sake
2017-10-01 00:21:47 -05:00
LetterJay
0cc54029e2
Merge pull request #3010 from Citadel-Station-13/upstream-merge-31096
...
[MIRROR] Cleans up some unused code
2017-10-01 01:19:36 -04:00
LetterJay
33b481dffb
Merge pull request #3008 from Citadel-Station-13/upstream-merge-31073
...
[MIRROR] Log attempted injections as well as successful ones
2017-10-01 01:19:20 -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
11b558c367
Merge branch 'master' into upstream-merge-31093
2017-10-01 00:50:26 -04:00
LetterJay
d6ec5791a6
Update dna.dm
2017-09-30 22:35:57 -05:00
Leo
318d28976f
Merge pull request #31143 from praisenarsie/patch-2
...
adds a space
2017-09-30 21:45:47 -05: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
Leo
d845fc7aa8
Removes irccheck admin restriction
2017-09-30 21:34:22 -05:00
KorPhaeron
e53fd73557
Fixes meteors not working with multi z ( #31137 )
2017-09-30 21:33:06 -05:00
Leo
fd7c9110ca
Structure istype define
2017-09-30 21:31:57 -05:00
MoreRobustThanYou
e63e05255f
Fixes cogscarab sprites not updating ( #31142 )
...
* Fixes cogscarab sprites now updating
* fix spacing
* Update extra_drone_types.dm
2017-09-30 21:30:48 -05:00
vuonojenmustaturska
e8a1ceffcb
Speeds up simple_animals/hostile/proc/CanAttack()
2017-09-30 19:48:59 -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
CitadelStationBot
aaa2a214cb
[MIRROR] Fixes material container flags precedence ( #3029 )
...
* Fixes material container flags precedence
* Update material_container.dm
2017-09-30 12:39:57 -07: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
7193e9da83
Update wires.dm
2017-09-30 14:25:29 -05:00
LetterJay
cae6983aea
Update wizarditis.dm
2017-09-30 14:25:05 -05:00
LetterJay
99319f5d4d
Update shuttle.dm
2017-09-30 14:23:40 -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
6c4934a34a
Update ai_laws.dm
2017-09-30 14:22:12 -05:00
LetterJay
6ec50aeae2
Update observer.dm
2017-09-30 14:20:50 -05:00
LetterJay
9f01bf378d
Update hypospray.dm
2017-09-30 14:20:25 -05:00
LetterJay
4fd4d77eb1
Update shade.dm
2017-09-30 14:20:01 -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
a6a4deb94c
Merge pull request #2973 from Citadel-Station-13/upstream-merge-31084
...
[MIRROR] Fixes transitions
2017-09-30 15:18:26 -04:00
LetterJay
d4cdba3297
Update parrot.dm
2017-09-30 14:18:02 -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
2bbc880bf1
Merge pull request #3009 from Citadel-Station-13/upstream-merge-31092
...
[MIRROR] Fixes subsystems not returning a qdel hint
2017-09-30 12:58:30 -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
2847d71e07
Merge pull request #3013 from Citadel-Station-13/upstream-merge-31089
...
[MIRROR] Fixes PA Href Issue
2017-09-30 12:57:21 -04:00
