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
Fox McCloud
b35eb8e96f
Merge pull request #6086 from tigercat2000/shuttle_hijack
...
Hijacking a shuttle diverts it to the syndicate outpost
2017-02-08 10:05:34 -05:00
Fox-McCloud
efb49ef18e
Reagent Grinder Hotfix
2017-02-08 03:19:50 -05:00
Crazy Lemon
4f32d8f0f8
Merge pull request #6339 from Fox-McCloud/botany-reagents
...
Botany reagents Tweak
2017-02-07 20:03:08 -08: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
d11dfa7a3b
Merge pull request #6343 from Fox-McCloud/reagent-tank-thingy
...
Refactors Reagent Tanks--Adds High Capacity Water Tank
2017-02-07 19:58:28 -08:00
Crazy Lemon
685250501b
Merge pull request #6345 from Fox-McCloud/monkey-cube-refactor
...
Monkey cube refactor
2017-02-07 19:53:58 -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
15b4fc04a5
plasma in blumpkins
2017-02-07 07:01:58 -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
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
Fox-McCloud
462ef49c29
tweaks
2017-02-06 04:37:15 -05:00
Markolie
4100482e76
Remove remaining newscast announcements
2017-02-05 20:15:24 +01:00
Fox-McCloud
846ce475b2
Refactors Reagent Tanks--Adds High Capacity Water Tank
2017-02-05 13:58:24 -05: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
Tigercat2000
5e8c14789b
Merge remote-tracking branch 'upstream/master' into shuttle_hijack2
2017-02-05 07:41:14 -08:00
Fox-McCloud
c5f3cf94e9
replica pod people
2017-02-05 09:55:10 -05:00
Fox-McCloud
69e1c69bec
fishwater re-addition
2017-02-05 09:36:27 -05: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
3b59726371
Botany Reagent Changes
2017-02-05 06:25:39 -05: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
