XDTM
bae882bf46
Fixes Abyssal Gaze blinding forever
2018-01-02 08:22:32 -06:00
Dax Dupont
0ebd16f509
Solar control fixes ( #33985 )
...
* Solar fixes
* Also removing the solcon-o icon
2018-01-02 08:21:16 -06:00
LetterJay
b3eb85cdd2
Merge pull request #4633 from Citadel-Station-13/upstream-merge-34035
...
[MIRROR] Puts back the changeturf part of PlaceOnTop()
2018-01-02 08:02:02 -06:00
LetterJay
d035f16aca
Update basilisk.dm
2018-01-02 05:24:47 -06:00
LetterJay
f2f6d9d910
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829
...
# Conflicts:
# code/modules/events/alien_infestation.dm
# code/modules/events/spider_infestation.dm
# code/modules/events/vent_clog.dm
# code/modules/mob/living/simple_animal/hostile/hostile.dm
2018-01-02 05:16:13 -06:00
LetterJay
b49009d481
Merge pull request #4454 from Citadel-Station-13/upstream-merge-33621
...
[MIRROR] removes silly garbage defines
2018-01-02 04:52:57 -06:00
LetterJay
f786a90bad
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33574
...
# Conflicts:
# code/controllers/subsystem/idlenpcpool.dm
2018-01-02 04:37:36 -06:00
LetterJay
c9482653f1
Merge pull request #4395 from Citadel-Station-13/upstream-merge-33537
...
[MIRROR] Defines all subsystem priority values
2018-01-02 04:21:05 -06:00
oranges
18f5e1095a
Merge pull request #34035 from ninjanomnom/actually-changeturf
...
Puts back the changeturf part of PlaceOnTop()
2018-01-02 00:12:32 -06:00
LetterJay
9ede14fbce
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33574
2018-01-01 14:14:06 -06:00
LetterJay
30d4b25aee
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829
2018-01-01 14:09:07 -06:00
LetterJay
3ee2569379
Update borer_event.dm
2018-01-01 14:07:17 -06:00
LetterJay
ea3652c30e
fuk
2018-01-01 11:07:40 -06:00
LetterJay
c2b23984ca
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33660
2018-01-01 10:59:13 -06:00
LetterJay
5486f71010
woo
2018-01-01 07:30:50 -06:00
LetterJay
168519c328
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-32311
2018-01-01 07:00:34 -06:00
LetterJay
6c147c9ef3
Merge branch 'master' into upstream-merge-33660
2018-01-01 04:59:20 -06:00
LetterJay
7d4a51f659
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33463
2018-01-01 04:36:29 -06:00
LetterJay
cd3f399924
Merge pull request #4619 from Citadel-Station-13/upstream-merge-33954
...
[MIRROR] fixes component's dupe
2018-01-01 04:27:20 -06:00
LetterJay
d986ca1ee3
Merge pull request #4594 from Citadel-Station-13/upstream-merge-33911
...
[MIRROR] Adds white and rainbow gloves to the gloves/color/random selection pool
2018-01-01 04:26:56 -06:00
LetterJay
7078a7ea49
Merge pull request #4598 from cebutris/cebusoap2
...
adds functional cebusoap
2018-01-01 04:26:03 -06:00
LetterJay
1463a442a5
Merge pull request #4596 from Citadel-Station-13/upstream-merge-33915
...
[MIRROR] Removes suit sensors from bural garbs
2018-01-01 04:25:37 -06:00
LetterJay
515092bd1c
Merge branch 'master' into upstream-merge-33919
2018-01-01 04:11:29 -06:00
LetterJay
07adb3fdd6
Update teleporter.dm
2018-01-01 04:06:33 -06:00
LetterJay
4899131230
Update teleporter.dm
2018-01-01 04:06:14 -06:00
LetterJay
3a8f27a2bf
Merge pull request #4623 from Citadel-Station-13/upstream-merge-33960
...
[MIRROR] Corrects flamethrower capitalization
2017-12-31 15:23:14 -06:00
LetterJay
8369a3886d
Merge pull request #4622 from Citadel-Station-13/upstream-merge-33957
...
[MIRROR] cleans up some behaviour for PlaceOnTop/Bottom
2017-12-31 15:22:55 -06:00
LetterJay
2db4000f08
Merge pull request #4618 from Citadel-Station-13/upstream-merge-33951
...
[MIRROR] Fixes reset_perspective runtimes
2017-12-31 15:22:25 -06:00
LetterJay
d1febba415
Merge pull request #4616 from Citadel-Station-13/upstream-merge-33950
...
[MIRROR] Fixes thermals, also drops the see invisible from thermals.
2017-12-31 15:22:04 -06:00
Jordan Brown
54032f9c6d
Merge pull request #33960 from ShizCalev/flamer
...
Corrects flamethrower capitalization
2017-12-31 10:02:59 -06:00
Jordan Brown
4e0efc64d5
Merge pull request #33957 from ninjanomnom/helper-cleanup
...
cleans up some behaviour for PlaceOnTop/Bottom
2017-12-31 10:01:46 -06:00
Jordan Brown
159fe41ab8
Merge pull request #33948 from ShizCalev/abstract-frying
...
stops frying abstract or nodrop items
2017-12-31 10:01:38 -06:00
Jordan Brown
d0e5a38c29
Merge pull request #33954 from jammer312/components_fix
...
fixes component's dupe
2017-12-31 09:59:16 -06:00
Jordan Brown
19c35c63d6
Merge pull request #33951 from AnturK/perspective_fix
...
Fixes reset_perspective runtimes
2017-12-31 09:58:02 -06:00
LetterJay
7a6cf002d3
Revert "[MIRROR] Fix PDA message photos not being viewable"
2017-12-31 06:41:03 -06:00
AnturK
bbca0afa37
Fixes thermals, also drops the see invisible from thermals. ( #33950 )
2017-12-31 06:30:34 -06:00
LetterJay
873e3c7a35
Merge pull request #4615 from Citadel-Station-13/upstream-merge-33570
...
[MIRROR] Explosions now cause camera shake based on distance
2017-12-31 02:53:34 -06:00
LetterJay
34b4976c28
Merge pull request #4614 from Citadel-Station-13/upstream-merge-33949
...
[MIRROR] Makes it clear that command reports are IC.
2017-12-31 02:53:22 -06:00
LetterJay
d8e85b5f15
Merge pull request #4613 from Citadel-Station-13/upstream-merge-33945
...
[MIRROR] Improves loot drop spawners, adds AI law spawners to cores
2017-12-31 02:52:44 -06:00
LetterJay
88df151bd7
Merge pull request #4612 from Citadel-Station-13/upstream-merge-33947
...
[MIRROR] Last resort now requires a confirmation.
2017-12-31 02:52:29 -06:00
LetterJay
515c4a0472
Merge pull request #4611 from Citadel-Station-13/upstream-merge-33940
...
[MIRROR] Fix PDA message photos not being viewable
2017-12-31 02:52:03 -06:00
LetterJay
7998f037bd
Merge pull request #4609 from Citadel-Station-13/upstream-merge-33580
...
[MIRROR] Some modest clockcult balancing - vitality matrices, brass skewers, pressure sensors
2017-12-31 02:51:44 -06:00
LetterJay
ab11e4be2e
Merge pull request #4606 from Citadel-Station-13/upstream-merge-33937
...
[MIRROR] printplayer fix for jobless minds
2017-12-31 02:50:34 -06:00
LetterJay
503f8e2635
Merge pull request #4605 from Citadel-Station-13/upstream-merge-33805
...
[MIRROR] Fixed autolathes and ore redemption machines leaving things at previous shuttle locations
2017-12-31 02:50:21 -06:00
LetterJay
8f2aab0908
Merge pull request #4595 from Citadel-Station-13/upstream-merge-33930
...
[MIRROR] Fixes assistants spawning naked
2017-12-31 02:50:00 -06:00
Jordan Brown
a57eba6a16
Explosions now cause camera shake based on distance ( #33570 )
...
* Explosions now cause camera shake based on distance
* Explosion close camera shake down to 2.5s
* Explosion camera shake max 100 close intensity, 50 far
2017-12-31 02:32:41 -06:00
BeeSting12
7dac76651e
Makes it clear that command reports are IC. ( #33949 )
...
* fixes #33936
* sticky's idea was better
2017-12-31 02:28:25 -06:00
vuonojenmustaturska
9dd9d9413a
Improves loot drop spawners, adds AI law spawners to cores ( #33945 )
...
* hymn to breaking strain
* remove subtypes as requested
* no-one saw that
2017-12-31 02:27:12 -06:00
F-OS
9c8959f2ff
Last resort now requires a confirmation. ( #33947 )
...
* Update headcrab.dm
* fixed
* fuck
* Update headcrab.dm
* Update headcrab.dm
2017-12-31 02:24:53 -06:00
Tad Hardesty
38870f4056
Fix PDA message photos not being viewable
2017-12-30 21:27:31 -06:00
