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
93df42e792
Merge pull request #6342 from uraniummeltdown/clingmemory
...
Changeling Absorb Memory Fix
2017-02-07 09:21:32 -05:00
Fox-McCloud
7d72f348c3
Fix Diona Nymph Crossing Trays--Refactors Diona Feeding
2017-02-06 21:15:19 -05: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
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
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
Fox-McCloud
b1f789e104
fixes a ton of thing
2017-01-24 03:23:16 -05:00
Fox-McCloud
3e87bd3370
more adjustments and fixes
2017-01-23 05:56:17 -05:00
Fox-McCloud
5c828db250
fixes, comfrey, and aloe
2017-01-23 05:25:42 -05:00
Fox-McCloud
7007f6bbdf
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-23 01:01:09 -05:00
Fox-McCloud
dc0710135e
more fixes
2017-01-23 00:53:44 -05:00
Markolie
e9cc69ea3f
If check spaces
2017-01-22 19:18:13 +01:00
Markolie
d6276ae978
Tiger's comments
2017-01-22 19:15:26 +01:00
Fox-McCloud
706347fd84
even more work
2017-01-22 08:11:31 -05:00
Fox-McCloud
10c0e734c3
more work
2017-01-22 01:46:48 -05:00
Fox-McCloud
ea76990b7a
Botany Rework
2017-01-21 18:28:03 -05:00
Markolie
2cedb7b20b
Remove pooling, minor fixes
2017-01-21 02:48:19 +01:00
Markolie
a50a3d59b9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__DEFINES/is_helpers.dm
# code/_globalvars/lists/objects.dm
# code/game/machinery/turrets.dm
# config/example/config.txt
# goon/browserassets/css/browserOutput.css
# icons/obj/library.dmi
# icons/turf/floors.dmi
2017-01-20 23:43:35 +01:00
Crazy Lemon
37a7484976
Merge pull request #6149 from FlattestGuitar/log-upgrade
...
Adds log stacking to admin logs
2017-01-18 19:13:50 -08:00
Fox McCloud
03e3f1d624
Merge pull request #6169 from Aurorablade/KALIMAH
...
Bugsie 3
2017-01-18 18:52:19 -05:00
Crazy Lemon
deba5d8b95
Merge pull request #6170 from Fox-McCloud/species-lever-options
...
Adds Species Levers
2017-01-18 15:35:17 -08:00
Mieszko Jędrzejczak
1b506aaf9f
Switches over to the new system
2017-01-17 13:57:07 +01:00
