82f58c4ae2
Update mecha_defense.dm ( #31834 )
2017-10-23 08:20:02 -05:00
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
c7cf49ec6f
Revamps the recolor system of the Mk.37, gives variants appropriate firing pins, and adds a minor outline to the Model D sprite
...
Mk.37P now has the Judge Dredd pin, S now has loyalty pins. P's description updated with a warning. Model D has slightly tweaked sprites. Recolor menu for Mk.37P is now less spammy.
2017-10-23 18:11:16 +08:00
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
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
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
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
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
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
d7ee78ec0d
Update xenobiology.dm
2017-10-23 01:27:54 -05:00
4dc2ac3d94
Merge branch 'master' into upstream-merge-31913
2017-10-23 01:25:35 -04:00
60e45814ab
Removes golem rune code
2017-10-23 00:10:47 -05:00
2c251f929f
Fixes being unable to merge full stacks ( #31992 )
2017-10-23 00:09:29 -05:00
878a52ab3f
Update furrypeople.dm
2017-10-22 23:43:10 -05:00
5c0e88722e
Merge pull request #32017 from ACCount12/patch-1
...
Fixes a SET_CONFIG bug
2017-10-22 23:38:37 -05:00
082a713848
Composting plants/pills transfers all reagents ( #31923 )
2017-10-22 17:53:24 -05:00
5504b4c1e2
Fixes champrojector camera bug ( #31948 )
2017-10-22 17:50:11 -05:00
0faee43f95
Cleans up datum traitor minimally. ( #31978 )
...
* Removes the /custom traitor subtype nonsense.
Fixes borged/ai'zed traitors getting law 0.
* Not needed anymore
2017-10-22 17:44:55 -05:00
5bce9bc2b0
Merge pull request #3514 from Citadel-Station-13/upstream-merge-31904
...
[MIRROR] Fixes stack overflow in orbit datum
2017-10-22 16:39:58 -04:00
5337b1fed2
Merge pull request #3492 from Citadel-Station-13/upstream-merge-31780
...
[MIRROR] Disentangles blob from blob mode/removes blob mode
2017-10-22 16:39:35 -04:00
404740d784
Adds spiders to the shapeshift menu! ( #31896 )
...
* >gondolas
* :(
2017-10-22 13:55:07 -05:00
88133e6f60
Removes an empty New()
2017-10-22 11:31:46 -05:00
1794018ae1
Removes mob.lastattacked and replaces lastattacker with a string
2017-10-22 11:29:35 -05:00
98f1560e6b
Merge pull request #3546 from Citadel-Station-13/upstream-merge-31964
...
[MIRROR] Blood Brother now properly sets special role
2017-10-22 12:26:01 -04:00
33be2da9d5
Merge pull request #3544 from Citadel-Station-13/upstream-merge-31927
...
[MIRROR] Safeguards GetAllContents and makes it throw a warning
2017-10-22 12:25:51 -04:00
000f1c89a3
Merge pull request #3543 from Citadel-Station-13/upstream-merge-31935
...
[MIRROR] Fixes shades being sent back to the arrival shuttle when their stone is qdel'd
2017-10-22 12:25:42 -04:00
2970c7d66f
Merge pull request #3542 from Citadel-Station-13/upstream-merge-31931
...
[MIRROR] It's a time to stop warning about paper bins eating pens
2017-10-22 12:25:33 -04:00
74411b190d
Merge pull request #3541 from Citadel-Station-13/upstream-merge-31958
...
[MIRROR] Fixes quick_attack_loop stack overflow
2017-10-22 12:25:18 -04:00
63d0bdd6ee
Merge pull request #3540 from Citadel-Station-13/upstream-merge-31937
...
[MIRROR] Adds sanity check to Narsie pickcultist proc
2017-10-22 12:25:10 -04:00
a874d84ba2
Merge pull request #3539 from Citadel-Station-13/upstream-merge-31914
...
[MIRROR] Fixes wizard roundend with liches around
2017-10-22 12:21:00 -04:00
d637f7b617
Merge pull request #3537 from Citadel-Station-13/upstream-merge-31951
...
[MIRROR] Logs subsystem shutdowns
2017-10-22 12:20:51 -04:00
227e681f28
Merge pull request #3536 from Citadel-Station-13/upstream-merge-31973
...
[MIRROR] Fixed projectile runtimes
2017-10-22 12:19:47 -04:00
de45b2fc00
Merge pull request #3531 from Citadel-Station-13/upstream-merge-31882
...
[MIRROR] Blank globals will no longer assign null to themselves
2017-10-22 12:18:48 -04:00
05e1efd020
Merge pull request #3529 from Michiyamenotehifunana/nerf-nerfs
...
Nerfs Autolathed Foam Guns
2017-10-22 12:18:35 -04:00
8b4c183a26
Update lightswitch.dm
2017-10-22 10:55:52 -05:00
5d20c88a5c
Update false_alarm.dm
2017-10-22 10:55:42 -05:00
513dfc7821
Update transform_procs.dm
2017-10-22 10:51:36 -05:00
03690f9d67
Update blob.dm
2017-10-22 10:51:21 -05:00
529eaa6aca
Update player_panel.dm
2017-10-22 10:51:11 -05:00
dadc96ef98
Update overmind.dm
2017-10-22 10:50:58 -05:00
1bcb5f2c86
Update skeletons.dm
2017-10-22 10:48:29 -05:00
b7fa4410ce
Update communications.dm
2017-10-22 10:46:32 -05:00
26d6e9e67b
Gets rids of spawns in airlock code ( #31969 )
...
* Gets rids of spawns in airlock code
* Update airlock.dm
2017-10-22 00:16:54 -05:00
25b5bb3e44
Code Consistency: luminosity --> light_range
2017-10-22 00:06:35 -05:00
faf0e0a10a
Adds admin override for false alarm event.
2017-10-22 00:05:23 -05:00
04b3a18502
Biosuits now offer high Rad resistance ( #31974 )
...
* Biosuit rad resistance buff
* Buffed medical hardsuit rad resist
2017-10-21 23:16:18 -05:00
bc5c548e9b
Merge pull request #31989 from ninjanomnom/radiation-borg-fix
...
Fixes silicon mob contents becoming contaminated
2017-10-21 22:22:01 -05:00
7eb2af06c3
fixes compile
2017-10-21 22:18:19 -05:00
637273285d
Blood Brother now properly sets special role ( #31964 )
...
* Blood Brother now properly sets special role
* Update mob_helpers.dm
* Update mob_helpers.dm
* Update mob_helpers.dm
2017-10-21 20:15:49 -05:00
d0789ecaf9
Splits clothing.dm in 7 other files
2017-10-21 19:01:30 -05:00
kevinz000