Markolie
1d6754728b
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
...
# Conflicts:
# icons/mob/head.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/hats.dmi
# icons/obj/clothing/suits.dmi
2017-02-06 20:37:03 +01:00
Markolie
7513c5d396
Camera on paranormal ERT hardsuit fix, eye of god message fix
2017-02-06 20:31:31 +01:00
Markolie
8e4439c7f1
Add immortality talisman, add final items
2017-02-06 20:08:52 +01:00
Markolie
7a4c33bbcd
Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions
2017-02-06 19:55:37 +01:00
Markolie
2a23862c6a
Kinetic accelerator update, other fixes
2017-02-06 18:39:03 +01:00
Crazy Lemon
e4e99039ea
Merge pull request #6321 from uraniummeltdown/aidead
...
AI Sprites, Vox clothing sprites, click AI display as AI to interact with it
2017-02-06 07:13:05 -08:00
Crazy Lemon
3146568d4d
Merge pull request #6319 from KasparoVy/ipcname
...
IPC Names now Load Correctly from SQL
2017-02-06 07:11:07 -08:00
Fox McCloud
800a54cc15
Merge pull request #6320 from Kyep/ert_shuttle_access
...
Fixes ERT and SST shuttle accesses
2017-02-06 10:08:33 -05:00
Crazy Lemon
cc2eceb0a3
Merge pull request #6186 from Fox-McCloud/stunprod
...
Tweaks the Stunprod
2017-02-06 05:46:26 -08:00
Crazy Lemon
256099a1a3
Merge pull request #6303 from Kyep/clonepod_fix
...
Fixes #6030 - cloner autocloning people who have ghosted/cryoed
2017-02-06 05:27:23 -08:00
Fox McCloud
cd86cc5817
Merge pull request #6348 from Kyep/minefix
...
Prevents mines detonating when touched by ghosts
2017-02-06 07:28:03 -05:00
Fox McCloud
fb926cb0d4
Merge pull request #6328 from uraniummeltdown/linglink
...
Hivemind Link
2017-02-06 07:26:20 -05:00
Crazy Lemon
3741384fb0
Merge pull request #6337 from Fox-McCloud/banana-peel-sprite-fix
...
Fixes Iconless Banana Peels
2017-02-06 04:15:01 -08:00
Crazy Lemon
4a1cbc1536
Merge pull request #6344 from Fox-McCloud/hivelord-GC
...
Makes Hivelord Cores GC
2017-02-06 04:12:22 -08:00
Kyep
5d35de452a
Fixes conflict (rebase)
2017-02-06 04:09:15 -08:00
Crazy Lemon
32bbf77be6
Merge pull request #6286 from uraniummeltdown/aimech
...
AI control beacons for mechs
2017-02-06 04:04:34 -08:00
Kyep
b7590355b7
Fixes mines detonating when ghosts pass over them
2017-02-06 04:01:03 -08:00
Kyep
87deaccbe4
Krausus / Fox requests
2017-02-06 03:50:46 -08:00
Fox-McCloud
bdaf614b9d
Makes Hivelord Cores GC
2017-02-06 05:54:32 -05:00
Fox-McCloud
249cd3279c
Merge remote-tracking branch 'upstream/master' into stunprod
2017-02-06 05:35:59 -05:00
Fox McCloud
39c8c9e2c5
Merge pull request #6323 from Markolie/fixxxxx
...
Fix airless plating map issue
2017-02-06 05:17:31 -05:00
Fox McCloud
4f05357bae
Merge pull request #6335 from uraniummeltdown/objection
...
Plasmaman Lawyer Suit
2017-02-06 05:16:58 -05:00
VampyrBytes
a65948afaf
Fixes magnetic gripper drop item verb ( #6338 )
...
Fixes #6317
The name on this verb was the same as the name on
`\client\verb\drop_item()` and that was the verb that was actually
getting called, which does nothing if you're a robot
2017-02-06 05:16:10 -05:00
Fox McCloud
37fd14fd17
Merge pull request #6336 from uraniummeltdown/attacknotjump
...
removes attack_not_jump from notify_ghosts
2017-02-06 05:15:32 -05:00
Fox McCloud
051ce5a78c
Merge pull request #6333 from uraniummeltdown/oreboxscanner
...
Use advanced mining scanner on ore box to interact with it
2017-02-06 05:10:35 -05:00
Fox McCloud
4e901962d4
Merge pull request #6334 from uraniummeltdown/xenoconsole
...
Constructible Xenobiology Console
2017-02-06 05:09:51 -05:00
Markolie
ee3417f19a
Update chance
2017-02-06 01:42:59 +01:00
Markolie
dbe1284214
Adds ship in a bottle/lavaland boat, paranormal ERT spacesuits, update the sord
2017-02-06 01:42:32 +01:00
Markolie
72aec0f9f1
Add shared storage and godeye items, split Lavaland loot files
2017-02-06 01:02:03 +01:00
Markolie
b17dca7c57
Prevent signing own blood contract, prevent megafauna from healing on station, prevent hierophant teleports from going to Central Command
2017-02-05 20:36:04 +01:00
Markolie
4100482e76
Remove remaining newscast announcements
2017-02-05 20:15:24 +01:00
uraniummeltdown
e64c057842
Merge remote-tracking branch 'remotes/upstream/master' into objection
...
# Conflicts:
# icons/mob/head.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/hats.dmi
# icons/obj/clothing/suits.dmi
2017-02-05 17:11:24 +04:00
uraniummeltdown
3e6ee0c306
plasmaman lawyer/IAA suit
2017-02-05 17:06:27 +04:00
Fox-McCloud
2c986259af
Fixes Iconless Banana Peels
2017-02-05 06:43:14 -05:00
Fox-McCloud
390f6768b3
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
uraniummeltdown
5cf03d211d
removes attack_not_jump from notify_ghosts
2017-02-05 13:44:59 +04:00
Crazy Lemon
01c41cfb86
Merge pull request #6081 from Markolie/lavaland_megafauna
...
Ports Lavaland megafauna
2017-02-05 00:27:40 -08:00
Fox-McCloud
99cbcbfbf5
pre-emptive cut-down of conflicts.
2017-02-05 03:18:49 -05:00
Fox McCloud
baab43b840
Merge pull request #6332 from uraniummeltdown/cargoid
...
Cargonia ID skin for agent ID and ID Computer
2017-02-05 00:47:32 -05:00
uraniummeltdown
ab36cc791c
click status display as AI to change, vox clothing sprites from /vg/, added ai sprites from TG
2017-02-05 09:45:13 +04:00
uraniummeltdown
0f1e490c6f
xenobiology console is now constructible, works in the area it was built in along with all similarly named areas
2017-02-05 09:42:00 +04:00
uraniummeltdown
3d831b179b
hit ore box with advanced mining scanner to interact with it
2017-02-05 09:30:01 +04:00
Fox McCloud
bf38e4a719
Merge pull request #6325 from Aurorablade/Unholywater
...
Unholy water fix
2017-02-05 00:22:04 -05:00
uraniummeltdown
7dd342743a
added cargo ID skin to agent ID and ID Computer
2017-02-05 09:19:52 +04:00
uraniummeltdown
2620f4e365
adds hivemind link to changelings, allows them to give a victim in > neckgrab hivemind comms for 3 minutes
2017-02-04 17:45:22 +04:00
Fox-McCloud
ccd9d9596d
fungus among us
2017-02-04 05:01:03 -05:00
Fox-McCloud
f8602ffef8
last fixes, hopefully
2017-02-04 04:28:42 -05:00
Aurorablade
1943f059c5
Requested changes
2017-02-03 23:41:04 -05:00
Fox McCloud
917fb17e16
Merge pull request #6315 from DrunkDwarf/mrchangs-tweak
...
Tweak: Mr Chang's vending machine now refillable
2017-02-03 21:33:23 -05:00
Aurorablade
391976f7ed
I thought i deleted you....
2017-02-03 17:14:44 -05:00
