Commit Graph

7792 Commits

Author SHA1 Message Date
LetterJay
14ed0d84e8 kill-me 2017-10-24 11:57:08 -05:00
LetterJay
cb30805b04 Update custom_items.dm 2017-10-24 11:25:30 -05:00
LetterJay
ffd635e209 Merge pull request #3584 from Citadel-Station-13/revert-3580-upstream-merge-31560
Revert "[MIRROR] Late join antagonists will try to target late join players"
2017-10-24 01:10:17 -04:00
LetterJay
aa420067ba Revert "[MIRROR] Late join antagonists will try to target late join players" 2017-10-24 00:09:11 -05:00
LetterJay
95cb834389 dupe item state for donation item 2017-10-23 23:34:15 -05:00
LetterJay
dfe7295d4c Merge pull request #3580 from Citadel-Station-13/upstream-merge-31560
[MIRROR] Late join antagonists will try to target late join players
2017-10-23 23:02:37 -04:00
CitadelStationBot
1ca797a53e Automatic changelog generation for PR #3575 [ci skip] 2017-10-23 22:02:25 -05:00
LetterJay
00da8a2ead Merge pull request #3575 from deathride58/mapsyncs1
Map Syncs - TG-gnawed-on-too-many-cables Edition
2017-10-23 23:02:23 -04:00
CitadelStationBot
4ff830bf46 Late join antagonists will try to target late join players 2017-10-23 20:08:43 -05:00
Jordan Brown
94826620fa Late join antagonists will try to target late join players (#31560) 2017-10-23 20:08:43 -05:00
LetterJay
6360be2041 Merge pull request #3571 from Citadel-Station-13/upstream-merge-31883
[MIRROR] Removes duplicate typecaches
2017-10-23 20:16:51 -04:00
deathride58
2fc3636360 FUCK part 3 - fixes gravity generator assmos and also makes nonlethal armory look less like ass while im at it 2017-10-23 18:12:26 -04:00
LetterJay
74580efe35 Merge pull request #3572 from Citadel-Station-13/upstream-merge-31876
[MIRROR] Makes cleanbots clean up remains
2017-10-23 17:49:09 -04:00
deathride58
0a3f908a7b FUCK - fixes brig wiring 2017-10-23 17:33:04 -04:00
LetterJay
3243eaa6b8 Merge pull request #3573 from Citadel-Station-13/upstream-merge-32003
[MIRROR] fixes AIs being able to teleport the id card console inserted cards to their core
2017-10-23 16:54:57 -04:00
LetterJay
889d96269e Merge pull request #3574 from Citadel-Station-13/upstream-merge-32000
[MIRROR] Fixes get_turf_pixel returning null when called on turfs
2017-10-23 16:54:27 -04:00
LetterJay
434d7d0a0b Merge pull request #3576 from Citadel-Station-13/upstream-merge-32002
[MIRROR] Removes mob references from camera motion tracking
2017-10-23 16:54:12 -04:00
deathride58
cfb6f98c3c FIXES RWALL YES THIS IS NECESSARY FUCK 2017-10-23 15:58:33 -04:00
deathride58
ec6b7770c9 merges #3577 2017-10-23 15:47:43 -04:00
deathride58
c77421ec4a EMERGENCY BOX CLOWN/MIME OFFICE HOTFIX 2017-10-23 15:36:51 -04:00
LetterJay
ad3bafcb42 Update motion.dm 2017-10-23 14:16:15 -05:00
LetterJay
dd53de8859 Update mob.dm 2017-10-23 14:15:43 -05:00
LetterJay
f0a32458bb Update human_defines.dm 2017-10-23 14:15:30 -05:00
LetterJay
9367eb23c5 Update iv_drip.dm 2017-10-23 14:15:20 -05:00
LetterJay
9a86385a23 Merge pull request #3569 from Citadel-Station-13/upstream-merge-31834
[MIRROR] mechs no longer spam deflect attack messages for attacks with no damage
2017-10-23 15:08:45 -04:00
CitadelStationBot
9e47e120ce Automatic changelog generation for PR #3570 [ci skip] 2017-10-23 14:08:13 -05:00
LetterJay
97929ff3f1 Merge pull request #3570 from Citadel-Station-13/upstream-merge-31885
Fixes #3397
2017-10-23 15:08:11 -04:00
CitadelStationBot
78e0e83bf2 Automatic changelog generation for PR #3567 [ci skip] 2017-10-23 14:07:05 -05:00
LetterJay
9436a60b8f Merge pull request #3567 from Michiyamenotehifunana/ears-fix
Fixes several ears
2017-10-23 15:07:03 -04:00
LetterJay
c6fed7cd10 Merge pull request #3566 from Citadel-Station-13/upstream-merge-31996
[MIRROR] Fixes cleaning items in your hands
2017-10-23 15:04:41 -04:00
LetterJay
f2860a7760 Merge pull request #3565 from Citadel-Station-13/upstream-merge-31990
[MIRROR] Removes golem rune code
2017-10-23 14:52:58 -04:00
LetterJay
ae6cd4647c Merge pull request #3564 from Citadel-Station-13/upstream-merge-31995
[MIRROR] Renames 'Ready for Review' to 'Review Again'
2017-10-23 14:52:48 -04:00
LetterJay
fc07e15f61 Merge pull request #3563 from Citadel-Station-13/upstream-merge-31992
[MIRROR] Fixes being unable to merge full stacks
2017-10-23 14:52:28 -04:00
LetterJay
06942978b1 Merge pull request #3561 from Citadel-Station-13/upstream-merge-32017
[MIRROR] Fixes a SET_CONFIG bug
2017-10-23 14:51:06 -04:00
LetterJay
9f08b1898b Merge pull request #3560 from Citadel-Station-13/upstream-merge-31923
[MIRROR] Composting plants/pills transfers all reagents
2017-10-23 14:50:52 -04:00
CitadelStationBot
32bafcf090 Automatic changelog generation for PR #3559 [ci skip] 2017-10-23 13:50:36 -05:00
LetterJay
c17d1dce40 Merge pull request #3559 from Citadel-Station-13/upstream-merge-31948
[MIRROR] Fixes champrojector camera bugs
2017-10-23 14:50:34 -04:00
LetterJay
4136be0361 Merge pull request #3558 from Citadel-Station-13/upstream-merge-31978
[MIRROR] Cleans up datum traitor minimally.
2017-10-23 14:50:05 -04:00
CitadelStationBot
a8d91c0810 Automatic changelog generation for PR #3557 [ci skip] 2017-10-23 13:49:42 -05:00
LetterJay
04496c1e15 Merge pull request #3557 from Citadel-Station-13/upstream-merge-31896
[MIRROR] Adds spiders to the shapeshift menu!
2017-10-23 14:49:41 -04:00
LetterJay
ec7c39fb0a Merge pull request #3555 from Citadel-Station-13/upstream-merge-31950
[MIRROR] Removes an empty New()
2017-10-23 14:49:16 -04:00
LetterJay
ce2f1cc672 Merge pull request #3554 from Citadel-Station-13/upstream-merge-31981
[MIRROR] Removes mob.lastattacked and replaces lastattacker with a string
2017-10-23 14:48:10 -04:00
deathride58
6ead40bcee Boxstation security changes 2017-10-23 14:43:05 -04:00
vuonojenmustaturska
636ab7d156 Removes mob references from camera motion tracking 2017-10-23 13:32:32 -05:00
deathride58
268c80dc66 fixes areas, other small changes 2017-10-23 14:26:05 -04:00
LetterJay
11bcd573a0 Update mob_defines.dm 2017-10-23 13:17:52 -05:00
LetterJay
23765d9ddd Update stunbaton.dm 2017-10-23 13:17:35 -05:00
deathride58
c6150a0819 Boxstation major non-security map changes 2017-10-23 14:10:23 -04:00
deathride58
bc3e8968ab Deltastation + Metastation map changes 2017-10-23 13:41:57 -04:00
deathride58
c1bd7bc6ba Map syncs 1 - Code syncs 2017-10-23 12:56:26 -04:00