Crazy Lemon
87e4993152
Merge pull request #6717 from Fox-McCloud/laser-scalpel-refactor
...
Fixes Power Tools Materials and Recators Laser Scalpels
2017-03-23 15:20:56 -07:00
Fox-McCloud
6e22561208
Expands Autolathe Items and Enables Stock Parts
2017-03-21 20:04:26 -04:00
Jovan
65cb35fbb2
please no merge conflict.
2017-03-11 19:21:06 -05:00
Jovan
54ee658a94
mesies fix voxy stuff, yaya?
2017-03-11 16:50:13 -05:00
Fox McCloud
d6da6e3f52
Merge pull request #6527 from davipatury/modular_computers
...
Port's TG's modular computers
2017-03-11 04:51:49 -05:00
Fox-McCloud
9e94f2ceeb
Fixes Power Tools Materials and Recators Laser Scalpels
2017-03-09 02:08:42 -05:00
Markolie
3aa1399995
Implement usesound/toolspeed
2017-03-07 16:46:28 +01:00
Markolie
3b73053bc4
Tool fixes
2017-03-06 20:46:24 +01:00
Markolie
44e8080de2
Fix design names
2017-03-05 23:05:19 +01:00
Markolie
9ec1400ae1
Fix comments
2017-03-05 23:04:41 +01:00
Markolie
9d9e957df1
Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold
2017-03-05 19:53:20 +01:00
davipatury
af6db09309
Merge remote-tracking branch 'origin/master' into modular_computers
2017-03-04 15:44:20 -03:00
davipatury
8c7993b9d5
Crazylemon's suggestion.
2017-03-04 15:43:28 -03:00
davipatury
31f2ca0f63
Autolathe designs.
2017-02-23 12:18:17 -03:00
davipatury
67ee6fdd41
Laptop vendor, access tweaks and computer recipes.
2017-02-20 21:28:14 -03:00
Twinmold
e687103d76
Changes Biogenerator Belt Holster to Accessory Holster
...
This simply adjusts the currently available holster from the
biogenerator from being the belt item (which can only hold sketckins
(pistols) and the detective's revolver) to the accessory holster, which
is the same one Blueshields get.
:cl:Twinmold
Adjust: Biogenerator holster from belt object to accessory holster.
/🆑
2017-02-18 05:47:22 -06:00
Krausus
4754d6b4b3
Fixes some sounds not being cached properly
2017-02-17 02:37:26 -05:00
Fox McCloud
129d1c63f5
Merge pull request #6461 from davipatury/paradise
...
Urnaium
2017-02-16 00:37:13 -05:00
davipatury
cffe34e3f9
Description fix.
2017-02-15 20:04:26 -02:00
davipatury
63a690ca79
Urnaium.
2017-02-15 20:00:12 -02:00
Fox-McCloud
c2c3881755
Merge remote-tracking branch 'upstream/master' into advanced-camera-fixup
2017-02-12 09:44:07 -05:00
Fox McCloud
04f5276047
Merge pull request #6350 from Markolie/lavaland_updates
...
Add remaining Lavaland loot, kinetic accelerator refactor
2017-02-11 00:02:42 -05:00
Crazy Lemon
17281506d2
Merge pull request #6123 from KasparoVy/vulp-cblind
...
Vulpkanin & Tajara mod. Colour Vision, Darksight to Eyes, Internal Mech(assist) Organ Icons
2017-02-10 18:27:58 -08:00
Markolie
c93a592102
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
...
# Conflicts:
# code/modules/shuttle/supply.dm
2017-02-10 18:19:53 +01:00
Fox McCloud
795fda7874
Merge pull request #6366 from uraniummeltdown/quantumpads
...
Quantum Pads
2017-02-10 07:28:27 -05:00
uraniummeltdown
60bb4fd5bc
ported quantum pads from TG and added to RnD
2017-02-09 00:33:07 +04:00
Markolie
3298f7edce
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
...
# Conflicts:
# icons/obj/objects.dmi
2017-02-08 19:25:47 +01:00
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
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
Fox-McCloud
5b8e6e7496
Advanced Camera Speedup and Sounds
2017-02-07 21:46:50 -05:00
Markolie
1d6754728b
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
...
# Conflicts:
# icons/mob/head.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/hats.dmi
# icons/obj/clothing/suits.dmi
2017-02-06 20:37:03 +01:00
Markolie
7a4c33bbcd
Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions
2017-02-06 19:55:37 +01: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
Markolie
2a23862c6a
Kinetic accelerator update, other fixes
2017-02-06 18:39:03 +01: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
4e901962d4
Merge pull request #6334 from uraniummeltdown/xenoconsole
...
Constructible Xenobiology Console
2017-02-06 05:09:51 -05:00
KasparoVy
ef5376ede2
conflict resolution
2017-02-05 17:13:34 -05: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
Fox-McCloud
390f6768b3
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -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
Fox-McCloud
f8602ffef8
last fixes, hopefully
2017-02-04 04:28:42 -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
Fox-McCloud
36dae0bfb5
botany gene disks in R&D
2017-01-30 01:55:30 -05:00
Markolie
3633b0aaa5
Makes firelocks constructable
2017-01-28 23:18:16 +01:00
Fox McCloud
e1e0824418
Merge pull request #6202 from uraniummeltdown/xenobio
...
Slime Transference Potion
2017-01-27 20:18:19 -05:00
Fox-McCloud
9b56e9ac70
fixes and forgotten botany belt
2017-01-27 19:28:00 -05:00
KasparoVy
28f9496713
Adds Colourblindness for Vulpkanin&Tajara, Refactors Darksight, tidying up, etc.
...
Adds colourblindness for Vulpkanin and Tajara that can be turned on by a
preference in character creation. By default, Vulpkanin and Tajara still
see in full colour, however their darksight is reduced to Human levels
unless they choose the 'unaugmented' eyes option.
Refactors darksight so it's tied to the eye organ. Refactors noir
glasses.
You can now visually distinguish mechanical/mechassisted organs from
their organic counterparts due to their names and icons.
Resolves issue w/ Colour-vision after Cloning/Lesser-to-greater Formswapping.
Cloned Vulpkanin and Tajara get unaugmented vision (colourblind and
darksight) by default since the cloners can't administer the
eye-augmentation surgery. Same goes for swapping from lesser to greater
form as a Changeling.
The monkey-forms of Vulpkanin and Tajara now have almost the same organs as
their greater forms, meaning they get the same colourblindness but
excellent darksight.
2017-01-25 23:06:30 -05:00
Fox-McCloud
b1f789e104
fixes a ton of thing
2017-01-24 03:23:16 -05:00
