Commit Graph

5396 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
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
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
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
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
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
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
LetterJay
97929ff3f1 Merge pull request #3570 from Citadel-Station-13/upstream-merge-31885
Fixes #3397
2017-10-23 15:08:11 -04:00
LetterJay
9436a60b8f Merge pull request #3567 from Michiyamenotehifunana/ears-fix
Fixes several ears
2017-10-23 15:07:03 -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
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
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
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
vuonojenmustaturska
636ab7d156 Removes mob references from camera motion tracking 2017-10-23 13:32:32 -05: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
c1bd7bc6ba Map syncs 1 - Code syncs 2017-10-23 12:56:26 -04:00
YPOQ
796d61a2dc Fixes get_turf_pixel returning null when called on turfs (#32000) 2017-10-23 09:00:35 -05:00
kevinz000
f4e0eab993 fixes AIs being able to teleport the id card console inserted cards to their core (#32003)
* Update card.dm

* Update card.dm
2017-10-23 08:59:24 -05:00
ShizCalev
4cc53d68a2 Makes cleanbots clean up remains (#31876)
* Makes cleanbots clean up remains

* Gooooooooo

* Acid_act
2017-10-23 08:38:52 -05:00
Jordan Brown
c51edc3bcd Removes duplicate typecaches 2017-10-23 08:25:30 -05:00
vuonojenmustaturska
1930e5cf84 Fixes grinders (#31885)
* But you're still hungry

* Update reagentgrinder.dm
2017-10-23 08:22:17 -05:00
kevinz000
82f58c4ae2 Update mecha_defense.dm (#31834) 2017-10-23 08:20:02 -05:00
Michiyamenotehifunana
9d52443c53 Fixes #2946
Otusian, wolf, and skunk ears now show up on humans. Cat, Big ears now show up on mammals.
2017-10-23 19:29:46 +08:00
LetterJay
095839becf Merge pull request #3553 from Citadel-Station-13/upstream-merge-31969
[MIRROR] Gets rids of spawns in airlock code
2017-10-23 04:05:19 -04:00
LetterJay
a1236008f3 Merge pull request #3552 from Citadel-Station-13/upstream-merge-31355
[MIRROR] Code Consistency: luminosity --> light_range
2017-10-23 03:44:46 -04:00
LetterJay
58ef2f1872 Merge pull request #3551 from Citadel-Station-13/upstream-merge-31922
[MIRROR] Adds admin override for false alarm event.
2017-10-23 03:44:25 -04:00
LetterJay
20bbd77f73 Merge pull request #3549 from Citadel-Station-13/upstream-merge-31974
[MIRROR] Biosuits now offer high Rad resistance
2017-10-23 03:44:18 -04:00
LetterJay
82d02050cd Merge pull request #3547 from Citadel-Station-13/upstream-merge-31989
[MIRROR] Fixes silicon mob contents becoming contaminated
2017-10-23 03:35:35 -04:00
LetterJay
8382fdf6b6 Merge pull request #3545 from Citadel-Station-13/upstream-merge-31960
[MIRROR] Splits clothing.dm in 7 other files
2017-10-23 03:35:25 -04:00
LetterJay
d7ee78ec0d Update xenobiology.dm 2017-10-23 01:27:54 -05:00
LetterJay
4dc2ac3d94 Merge branch 'master' into upstream-merge-31913 2017-10-23 01:25:35 -04:00
YPOQ
60e45814ab Removes golem rune code 2017-10-23 00:10:47 -05:00
YPOQ
2c251f929f Fixes being unable to merge full stacks (#31992) 2017-10-23 00:09:29 -05:00
Jordan Brown
5c0e88722e Merge pull request #32017 from ACCount12/patch-1
Fixes a SET_CONFIG bug
2017-10-22 23:38:37 -05:00