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
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
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
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
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
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
Aurorablade
37573a4339
Bugfix
2017-02-03 17:05:37 -05:00
Markolie
f70ab98e4c
Fix airless plating map issue
2017-02-03 19:20:42 +01:00
Mark van Alphen
fe62b212b4
Merge branch 'master' into lavaland_megafauna
2017-02-02 20:17:31 +01:00
Fox McCloud
c7bb9fd91a
Merge pull request #6301 from Alexshreds/bugaroo
...
Deconstructing Closets Yields Proper Amount of Metal
2017-02-02 11:07:54 -05:00
Brian McGillivray
23139987a0
Tweak: Mr Chang's vending machine now refillable
...
Changed the Mr Chang's vending machine to be able to be refiled with a
new Chinese vending refill canister crate that can be ordered by Cargo.
2017-02-02 15:49:27 +00:00
Fox McCloud
3d587dea5b
Merge pull request #6177 from uraniummeltdown/new
...
Cyborg Blueprints
2017-02-02 00:50:33 -05:00
Fox McCloud
29d73519fc
Merge pull request #6284 from Kyep/summon_protect
...
Adds check to narsie/eldergod summoning, as slaughter summoning already has
2017-02-02 00:49:49 -05:00
Fox-McCloud
ed4ae3dd8f
irrigation and missing sprites
2017-02-02 00:32:52 -05:00
Chakirski
f39fe8ab75
muh future
2017-02-01 21:29:04 -06:00
Fox McCloud
cd4acc5db8
Merge pull request #6307 from Markolie/fixxxxx
...
Fix security record time and mecha attackby cooldown
2017-02-01 21:58:32 -05:00
Markolie
1a44f3b3d4
Add attack animation to mecha attackby
2017-02-01 18:47:10 +01:00
Markolie
d83c28fb54
Removes year from security computer
2017-02-01 18:44:21 +01:00
Markolie
2716083dc3
Fix security record time and mecha attackby cooldown
2017-02-01 18:39:36 +01:00
Chakirski
812c2db2fe
closets
2017-01-31 19:14:31 -06:00
Markolie
b55394ace3
Fix resource identifiers
2017-01-31 17:45:46 +01: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
Kyep
ce2a75f9da
Deletes copypaste, including already-existing copypaste
2017-01-30 22:50:40 -08: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
Fox McCloud
c9b4a951ae
Merge pull request #6178 from FalseIncarnate/NTPS
...
NTPS: Requests Console Based Shipping
2017-01-31 01:26:21 -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
Crazy Lemon
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
Crazy Lemon
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
Crazy Lemon
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
