Crazylemon64
1840074921
Refactors "organs" to be "bodyparts" to end confusion once and for all
2017-04-29 23:23:09 -07:00
Markolie
d9653c79f5
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace
...
# Conflicts:
# code/game/machinery/recharger.dm
# code/game/objects/items/devices/autopsy.dm
# code/game/objects/items/devices/modkit.dm
# code/game/objects/structures/lattice.dm
2017-04-14 18:15:12 +02:00
Crazy Lemon
f9ee33a797
Merge pull request #7054 from Fox-McCloud/destroy-qdelnull
...
Converts Most Destroys to use QDEL_NULL
2017-04-05 23:49:19 -07:00
Fox McCloud
4fd0ca5d82
Merge pull request #7029 from davipatury/rcl-design
...
Gives RCL an autolathe design
2017-04-06 02:33:32 -04:00
Fox McCloud
4ad7cd17fd
Merge pull request #7043 from SamHPurp/assorted-fixes
...
Fixes
2017-04-05 19:15:12 -04:00
Fox-McCloud
5631d36ff8
Converts Most Destroys to use QDEL_NULL
2017-04-04 23:08:41 -04:00
davipatury
76d70b85ff
Gives RCL a autolathe design.
2017-04-04 19:09:23 -03:00
Fox-McCloud
8fb17b2bee
moarrr
2017-04-04 04:26:53 -04:00
Sam
ae6dac5c5a
Fixes Recitence -> Reticence
2017-04-04 09:04:03 +01:00
Mark van Alphen
2d1c04c112
Merge branch 'master' into findnreplace
2017-04-01 23:51:58 +02:00
Crazy Lemon
9c233a676d
Merge pull request #6865 from Fox-McCloud/receiverssss
...
Adds Modular Receivers to Loot Table and Hacked Autolathes
2017-03-30 18:32:32 -07:00
davipatury
8963e96c41
effect/spider to structure/spider
2017-03-27 19:01:25 -03:00
Mark van Alphen
cd78336ab8
Merge branch 'master' into findnreplace
2017-03-25 00:11:39 +01:00
Fox-McCloud
182dcd93b5
autolathe receivers
2017-03-24 16:57:25 -04:00
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
Mark van Alphen
06b3460d6e
Merge branch 'master' into findnreplace
2017-03-15 16:02:14 +01: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
Mark van Alphen
cef5626f85
Merge branch 'master' into findnreplace
2017-03-09 17:32:42 +01: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
Mark van Alphen
8396863d7f
Merge branch 'master' into findnreplace
2017-02-22 16:39:53 +01:00
Markolie
6982014a6e
Replace all BYOND text macros
2017-02-21 15:41:37 +01: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
