Commit Graph

15115 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Aurorablade
391976f7ed I thought i deleted you.... 2017-02-03 17:14:44 -05:00
Aurorablade
37573a4339 Bugfix 2017-02-03 17:05:37 -05:00
Kyep
4e586e0db4 Fixes ERT and SST shuttle accesses 2017-02-02 17:47:21 -08:00
KasparoVy
32c4ba083d IPC Names now Load Correctly from SQL
If you want to have a name like ARMA-420 in game you previously had to
manually set it every round because it wouldn't load properly from SQL
because reject_bad_name doesn't like no numbers.

Changes that.
2017-02-02 20:33:32 -05: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
Fox-McCloud
ed4ae3dd8f irrigation and missing sprites 2017-02-02 00:32:52 -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
0415e5ab3a consistency 2017-01-31 01:39:38 -05:00
Fox McCloud
0874ea7295 Merge pull request #6152 from uraniummeltdown/windowflash
Window Flashing
2017-01-31 01:30:39 -05:00