Markolie
b0d4f5d92a
Various fixes
2017-02-10 18:55:23 +01:00
Markolie
c14b560ee0
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixxxxx
2017-02-10 18:21:06 +01:00
Markolie
403b512c9b
Merge if conditions
2017-02-09 23:29:10 +01:00
Markolie
0824101f0a
Sanity checking for faction copy
2017-02-09 18:57:09 +01:00
Markolie
95f750d6f2
Add faction support to pAI's
2017-02-09 18:54:26 +01:00
Markolie
d7f8f68ff8
Fix posibrain whispering while muted
2017-02-08 22:12:59 +01:00
Markolie
7039ac7a6f
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction
...
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
2017-02-08 19:21:57 +01:00
Crazy Lemon
2d77a0ab4d
Merge pull request #6357 from Fox-McCloud/var-edit-fixes
...
On Varedit Fixes
2017-02-07 20:01:32 -08:00
Crazy Lemon
7b39b5ae58
Merge pull request #6358 from Fox-McCloud/all-mobs-hard-del
...
Makes all Mobs Hard Delete
2017-02-07 19:35:58 -08:00
Crazy Lemon
1f60fef9ea
Merge pull request #6352 from Fox-McCloud/hydro-tray-nymph
...
Fix Diona Nymph Crossing Trays--Refactors Diona Feeding
2017-02-07 19:35:21 -08:00
Crazy Lemon
7561459cb5
Merge pull request #6296 from KasparoVy/steal-storageimp-check
...
Traitor Steal Objective now Checks Storage Implants
2017-02-07 10:05:44 -08:00
Fox-McCloud
e60cc252c6
fix
2017-02-07 10:01:20 -05:00
Fox-McCloud
8ad196da0f
Makes all Mobs Hard Delete
2017-02-07 09:42:49 -05:00
Fox McCloud
93df42e792
Merge pull request #6342 from uraniummeltdown/clingmemory
...
Changeling Absorb Memory Fix
2017-02-07 09:21:32 -05:00
Fox-McCloud
579e3bcbd4
forgot this one
2017-02-07 08:54:39 -05:00
Fox-McCloud
ad2468196e
On Varedit Fixes
2017-02-07 08:44:50 -05:00
Fox-McCloud
7d72f348c3
Fix Diona Nymph Crossing Trays--Refactors Diona Feeding
2017-02-06 21:15:19 -05:00
Markolie
7bdc9a4ca7
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction
...
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
2017-02-06 18:54:04 +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
Fox McCloud
fb926cb0d4
Merge pull request #6328 from uraniummeltdown/linglink
...
Hivemind Link
2017-02-06 07:26:20 -05: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
Crazy Lemon
32bbf77be6
Merge pull request #6286 from uraniummeltdown/aimech
...
AI control beacons for mechs
2017-02-06 04:04:34 -08:00
Fox-McCloud
bdaf614b9d
Makes Hivelord Cores GC
2017-02-06 05:54:32 -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
Markolie
4100482e76
Remove remaining newscast announcements
2017-02-05 20:15:24 +01:00
Markolie
83cd030134
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into construction
...
# Conflicts:
# _maps/map_files/cyberiad/cyberiad.dmm
2017-02-05 19:46:41 +01:00
uraniummeltdown
d87603054b
say_log for mobs, fixed changeling absorb memory, changelings can now see past 8 messages of absorbed victim
2017-02-05 22:00:17 +04: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
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
Fox-McCloud
99cbcbfbf5
pre-emptive cut-down of conflicts.
2017-02-05 03:18:49 -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
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
Mark van Alphen
fe62b212b4
Merge branch 'master' into lavaland_megafauna
2017-02-02 20:17:31 +01:00
Fox McCloud
3d587dea5b
Merge pull request #6177 from uraniummeltdown/new
...
Cyborg Blueprints
2017-02-02 00:50:33 -05:00
Markolie
2b767bb9c9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/modules/mob/mob_helpers.dm
# icons/obj/ammo.dmi
# icons/obj/guns/projectile.dmi
# icons/obj/storage.dmi
2017-01-31 17:44:38 +01:00
uraniummeltdown
8c10df3bd3
adds AI control beacons to exofab, mechs with these installed can be controlled by any AIs
...
adds diag hud icons for mechs with tracking beacons installed
2017-01-31 20:14:05 +04:00
uraniummeltdown
7259e4ce07
blueprints for engiborgs
2017-01-31 19:22:29 +04:00
KasparoVy
4a9f7f28f7
Traitor Steal Objective now Checks Storage Implants
...
Does what it says on the tin. In assessing the completion of a steal
objective, storage implants will now be checked.
2017-01-31 05:01:23 -05:00
Fox McCloud
0874ea7295
Merge pull request #6152 from uraniummeltdown/windowflash
...
Window Flashing
2017-01-31 01:30:39 -05:00
Crazy Lemon
d76df747c5
Merge pull request #6272 from Markolie/fixxxxx
...
Give brains Galactic Common language
2017-01-30 22:02:34 -08:00
Tigercat2000
4e56bb9636
Add slot_collar, remove simple_animal add_inv/remove_inv
...
This is being done to remove the simple_animal/Topic() override.
2017-01-29 13:26:54 -08:00
Markolie
d65cc380fa
Give brains Galactic Common language
2017-01-29 00:06:00 +01:00
Markolie
3633b0aaa5
Makes firelocks constructable
2017-01-28 23:18:16 +01:00
Fox-McCloud
7f2e71b0df
GC fixes and explosive vine fix
2017-01-28 11:06:42 -05:00
Fox-McCloud
a77c40389e
hydro hud working
2017-01-26 02:01:40 -05:00
