800a54cc15
Merge pull request #6320 from Kyep/ert_shuttle_access
...
Fixes ERT and SST shuttle accesses
2017-02-06 10:08:33 -05:00
cc2eceb0a3
Merge pull request #6186 from Fox-McCloud/stunprod
...
Tweaks the Stunprod
2017-02-06 05:46:26 -08:00
fb926cb0d4
Merge pull request #6328 from uraniummeltdown/linglink
...
Hivemind Link
2017-02-06 07:26:20 -05:00
4a1cbc1536
Merge pull request #6344 from Fox-McCloud/hivelord-GC
...
Makes Hivelord Cores GC
2017-02-06 04:12:22 -08:00
32bbf77be6
Merge pull request #6286 from uraniummeltdown/aimech
...
AI control beacons for mechs
2017-02-06 04:04:34 -08:00
bdaf614b9d
Makes Hivelord Cores GC
2017-02-06 05:54:32 -05:00
249cd3279c
Merge remote-tracking branch 'upstream/master' into stunprod
2017-02-06 05:35:59 -05:00
39c8c9e2c5
Merge pull request #6323 from Markolie/fixxxxx
...
Fix airless plating map issue
2017-02-06 05:17:31 -05:00
4f05357bae
Merge pull request #6335 from uraniummeltdown/objection
...
Plasmaman Lawyer Suit
2017-02-06 05:16:58 -05:00
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
37fd14fd17
Merge pull request #6336 from uraniummeltdown/attacknotjump
...
removes attack_not_jump from notify_ghosts
2017-02-06 05:15:32 -05:00
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
4e901962d4
Merge pull request #6334 from uraniummeltdown/xenoconsole
...
Constructible Xenobiology Console
2017-02-06 05:09:51 -05:00
4100482e76
Remove remaining newscast announcements
2017-02-05 20:15:24 +01:00
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
3e6ee0c306
plasmaman lawyer/IAA suit
2017-02-05 17:06:27 +04:00
390f6768b3
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
5cf03d211d
removes attack_not_jump from notify_ghosts
2017-02-05 13:44:59 +04:00
01c41cfb86
Merge pull request #6081 from Markolie/lavaland_megafauna
...
Ports Lavaland megafauna
2017-02-05 00:27:40 -08:00
99cbcbfbf5
pre-emptive cut-down of conflicts.
2017-02-05 03:18:49 -05:00
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
3d831b179b
hit ore box with advanced mining scanner to interact with it
2017-02-05 09:30:01 +04:00
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
ccd9d9596d
fungus among us
2017-02-04 05:01:03 -05:00
f8602ffef8
last fixes, hopefully
2017-02-04 04:28:42 -05:00
1943f059c5
Requested changes
2017-02-03 23:41:04 -05:00
391976f7ed
I thought i deleted you....
2017-02-03 17:14:44 -05:00
37573a4339
Bugfix
2017-02-03 17:05:37 -05:00
4e586e0db4
Fixes ERT and SST shuttle accesses
2017-02-02 17:47:21 -08:00
fe62b212b4
Merge branch 'master' into lavaland_megafauna
2017-02-02 20:17:31 +01:00
3d587dea5b
Merge pull request #6177 from uraniummeltdown/new
...
Cyborg Blueprints
2017-02-02 00:50:33 -05:00
ed4ae3dd8f
irrigation and missing sprites
2017-02-02 00:32:52 -05:00
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
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
7259e4ce07
blueprints for engiborgs
2017-01-31 19:22:29 +04:00
0415e5ab3a
consistency
2017-01-31 01:39:38 -05:00
0874ea7295
Merge pull request #6152 from uraniummeltdown/windowflash
...
Window Flashing
2017-01-31 01:30:39 -05:00
c9b4a951ae
Merge pull request #6178 from FalseIncarnate/NTPS
...
NTPS: Requests Console Based Shipping
2017-01-31 01:26:21 -05:00
d76df747c5
Merge pull request #6272 from Markolie/fixxxxx
...
Give brains Galactic Common language
2017-01-30 22:02:34 -08:00
dcc3df2118
Merge pull request #6278 from tigercat2000/saycodefix
...
Add slot_collar, remove simple_animal add_inv/remove_inv
2017-01-30 22:01:27 -08:00
e7e22f5dff
Merge pull request #6273 from Kyep/names_fix
...
Fixes some mobs being invisible in Check_antagonists
2017-01-30 21:59:33 -08:00
154e08bf10
Merge pull request #6282 from Kyep/ca_initial_xenos
...
Fixes initial Xenomorphs not appearing in Check Antagonists
2017-01-30 21:56:09 -08:00
0283e75fe5
Merge pull request #6254 from FlattestGuitar/erifle
...
Adds a laser carbine!
2017-01-31 00:43:15 -05:00
4842d77882
Merge pull request #6239 from Ar3nn/cluwnescanbreathetoo
...
Cluwne Mask now allows internals usage
2017-01-30 23:46:42 -05:00
ab6fffa4dc
Removes Oudated GC Info
2017-01-30 03:01:29 -05:00
36dae0bfb5
botany gene disks in R&D
2017-01-30 01:55:30 -05:00
6d6eec5934
Fixes initial Xenomorphs not appearing in Check Antagonists
2017-01-29 18:48:51 -08:00
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
6d4316264a
plant analyzer QoL
2017-01-29 03:37:22 -05:00
46f409ddfb
Fixes some mobs being invisible in Check_antagonists
2017-01-28 15:25:20 -08:00
Fox McCloud