Commit Graph

8211 Commits

Author SHA1 Message Date
Leo
2a0da701b2 Merge pull request #34801 from ShizCalev/DMM-viewer-fix
Fixes compatability issues with some third-party-java-based™ DMM viewers
2018-01-24 14:09:51 -06:00
LetterJay
9652fc4127 Merge pull request #5064 from Citadel-Station-13/upstream-merge-34783
[MIRROR] Cleans up duplicated code and GC issues
2018-01-24 13:59:44 -06:00
LetterJay
937d6c473a Merge pull request #5048 from Citadel-Station-13/upstream-merge-34769
[MIRROR] Cleans up unused mob vars
2018-01-24 13:56:23 -06:00
LetterJay
b898e53be0 Merge pull request #5065 from Citadel-Station-13/upstream-merge-34775
[MIRROR] Removed named args from visible_message
2018-01-24 13:54:34 -06:00
LetterJay
955e9ae09a Merge pull request #5063 from Citadel-Station-13/upstream-merge-34777
[MIRROR] Corrects invalid process_fire args
2018-01-24 13:54:23 -06:00
LetterJay
3993b42729 Merge pull request #5061 from Citadel-Station-13/upstream-merge-34826
[MIRROR] Makes the soapstone engravings use examine to show the dialog
2018-01-24 13:54:08 -06:00
LetterJay
1e2f180f16 Merge pull request #5060 from Citadel-Station-13/upstream-merge-34819
[MIRROR] Makes photocopier use default_unfasten_wrench
2018-01-24 13:53:48 -06:00
LetterJay
9c541bd1b2 Merge pull request #5057 from Citadel-Station-13/upstream-merge-34795
[MIRROR] Fixes no eye damage being done if damage was exactly 3
2018-01-24 13:53:11 -06:00
LetterJay
c34007cf4f Merge pull request #5056 from Citadel-Station-13/upstream-merge-34796
[MIRROR] Fixes emergency lights having null brightness
2018-01-24 13:52:55 -06:00
LetterJay
ee253a6c54 Merge pull request #5055 from Citadel-Station-13/upstream-merge-34808
[MIRROR] Abstract landmarks are now indestructible
2018-01-24 13:52:41 -06:00
LetterJay
8315716380 Merge pull request #5053 from Citadel-Station-13/upstream-merge-34766
[MIRROR] Xeno nests are no longer held together by bolts.
2018-01-24 13:51:48 -06:00
LetterJay
2234e522b8 Merge pull request #5052 from Citadel-Station-13/upstream-merge-34817
[MIRROR] Makes the point effect not trigger movement code
2018-01-24 13:51:34 -06:00
Leo
e71ce4e8cf Merge pull request #34775 from ShizCalev/removed-named-args-from-visible_message
Removed named args from visible_message
2018-01-24 11:59:50 -06:00
Leo
a7c7e9e8ec Merge pull request #34783 from Cyberboss/FixDumbness
Cleans up duplicated code and GC issues
2018-01-24 11:58:37 -06:00
Leo
18d193d3ee Merge pull request #34777 from ShizCalev/process-fire
Corrects invalid process_fire args
2018-01-24 11:56:22 -06:00
Leo
3c72877615 Merge pull request #34826 from DaxDupont/soapstone
Makes the soapstone engravings use examine to show the dialog
2018-01-24 11:49:47 -06:00
Leo
307465d156 Merge pull request #34819 from ACCount12/unwrenching_standardization
Makes photocopier use default_unfasten_wrench
2018-01-24 11:49:39 -06:00
Shadowlight213
4a2cd205aa Fixes no eye damage being done if damage was exactly 3 2018-01-24 06:13:14 -06:00
YPOQ
8c7645fd2b Fixes emergency lights having null brightness (#34796) 2018-01-24 06:13:06 -06:00
coiax
d7c317b6d0 Abstract landmarks are now indestructible (#34808)
In situations where a maxcap has been dropped above the Bridge, which is
generally the Observer-Start landmark's location, it would destroy the
landmark, making observers get a debugging message asking them to ahelp
when they observed.

There should be a better way of making an object indestructible from any
ingame effect without having to make it QDEL_HINT_LETMELIVE...
2018-01-24 06:12:57 -06:00
kevinz000
f903330b0e Xeno nests are no longer held together by bolts. (#34766)
* Update bed.dm

* Update alien_nest.dm
2018-01-24 06:12:37 -06:00
Jordan Brown
070a4bc0c4 Merge pull request #34817 from ninjanomnom/stop-pointing-at-me
Makes the point effect not trigger movement code
2018-01-24 06:12:29 -06:00
Dax Dupont
e47e31ff1d Puts beakers in your hand on eject (#34787) 2018-01-24 06:12:09 -06:00
LetterJay
f4a817be01 Merge pull request #5049 from Citadel-Station-13/upstream-merge-34820
[MIRROR] Fixes disposal initialization
2018-01-23 10:00:33 -06:00
LetterJay
0c3354cd16 Merge pull request #5047 from Citadel-Station-13/upstream-merge-34774
[MIRROR] Corrects addtime stack_trace typo
2018-01-23 10:00:19 -06:00
LetterJay
f26f1b5370 Merge pull request #5037 from Citadel-Station-13/upstream-merge-34522
[MIRROR] Adds ~70 more suicides
2018-01-23 10:00:04 -06:00
LetterJay
4c2c14784b Merge pull request #5035 from Citadel-Station-13/upstream-merge-34560
[MIRROR] Adds the Bluespace Drop Pod upgrade to the cargo express console
2018-01-23 09:59:41 -06:00
LetterJay
e672ff43ea Update timer.dm 2018-01-23 08:49:47 -06:00
LetterJay
ab002f56be Merge pull request #5046 from Citadel-Station-13/upstream-merge-34778
[MIRROR] Fixes invalid pollCandidatesForMob args
2018-01-23 08:24:31 -06:00
LetterJay
30ae21043f Merge pull request #5045 from Citadel-Station-13/upstream-merge-34476
[MIRROR] Simple rotation component.
2018-01-23 08:24:19 -06:00
LetterJay
72812999f1 Merge pull request #5044 from Citadel-Station-13/upstream-merge-34465
[MIRROR] Expands round end pop recording as json export
2018-01-23 08:24:08 -06:00
LetterJay
9544de1693 Merge pull request #5042 from Citadel-Station-13/upstream-merge-34733
[MIRROR] Fixes bot drop & bot assembly issues
2018-01-23 08:23:29 -06:00
LetterJay
b603bb9fbb Merge pull request #5041 from Citadel-Station-13/upstream-merge-34767
[MIRROR] Fix replace_random_law runtime
2018-01-23 08:23:10 -06:00
LetterJay
acb333d403 Merge pull request #5040 from Citadel-Station-13/upstream-merge-34765
[MIRROR] Fixes APC controller runtime
2018-01-23 08:22:56 -06:00
LetterJay
a7270f43cd Merge pull request #5039 from Citadel-Station-13/upstream-merge-34750
[MIRROR] current sanity check in ark of the justicar
2018-01-23 08:21:10 -06:00
LetterJay
6066ab31dd Update igniter.dm 2018-01-23 08:20:27 -06:00
LetterJay
888a132eff Update expressconsole.dm 2018-01-23 08:19:16 -06:00
LetterJay
9f24bac5e6 Merge pull request #5034 from Citadel-Station-13/upstream-merge-34142
[MIRROR] Refactors infrared beams to update faster
2018-01-23 08:18:38 -06:00
LetterJay
ccf1f97478 Merge pull request #5033 from Citadel-Station-13/upstream-merge-34810
[MIRROR] [s]Fixes being able to lower w_class of transfer valves
2018-01-23 08:18:21 -06:00
LetterJay
54d4cdd8ab Merge pull request #5031 from Citadel-Station-13/upstream-merge-34725
[MIRROR] Fixes portal storm event
2018-01-23 08:17:33 -06:00
LetterJay
fa0823c27d Merge pull request #5030 from Citadel-Station-13/upstream-merge-34727
[MIRROR] Stops simple_animals from attacking mobs in godmode
2018-01-23 08:17:21 -06:00
LetterJay
75af3bc248 Merge pull request #5029 from Citadel-Station-13/upstream-merge-34742
[MIRROR] Removes pulling claw instant messageless stun
2018-01-23 08:17:09 -06:00
LetterJay
8ad54530a1 Merge pull request #5028 from Citadel-Station-13/upstream-merge-34759
[MIRROR] Consolidated t-ray scanner code
2018-01-23 08:16:52 -06:00
AnturK
f70c357111 Fixes disposal initialization (#34820) 2018-01-23 06:46:45 -06:00
Leo
90b2e77b78 Merge pull request #34769 from ShizCalev/var-cleanup
Cleans up unused mob vars
2018-01-23 06:44:32 -06:00
Leo
3a11b4f068 Corrects addtime stack_trace typo 2018-01-23 06:43:20 -06:00
Leo
326228c43c Merge pull request #34778 from ShizCalev/pollCandidatesForMob
Fixes invalid pollCandidatesForMob args
2018-01-23 06:42:08 -06:00
AnturK
eb7974df7d Simple rotation component. (#34476)
I'm going to port other rotations to it when i don't feel lazy.
Closes #34064
2018-01-23 02:09:16 -06:00
Jordie
54466db36a Expands round end pop recording as json export (#34465)
* expands round end pop recording as json export

* 511 compatibility and fix

* readds feedback for ned
2018-01-23 01:57:53 -06:00
oranges
1caf34f0df Merge pull request #34733 from ShizCalev/box-fixes
Fixes bot drop & bot assembly issues
2018-01-23 01:44:09 -06:00