Commit Graph

309 Commits

Author SHA1 Message Date
uraniummeltdown cd6b6a61d7 added dog beds craftable from 10 wood planks 2017-03-17 17:46:04 +04:00
Fox McCloud 6bfd4013c0 Merge pull request #6753 from uraniummeltdown/grilles
Grille Code Update
2017-03-15 07:48:17 -04:00
Fox McCloud c6e3fe3cdb Merge pull request #6734 from uraniummeltdown/plastic
Plastic is not a mineral anymore, plastic flaps can be constructed/deconstructed
2017-03-15 06:33:02 -04:00
uraniummeltdown 2af6b1de23 grille code updates from tg, removed attack_self() from rods they now use recipes, refactored grille (de)construction, added broken grille object for mapping, grilles can be damaged by throwing objs or mobs at them, also general code cleanup 2017-03-12 16:35:24 +04:00
uraniummeltdown 85260a72ba plastic is not a mineral anymore, plastic flaps are deconstructible, new construction.dm construction defines 2017-03-12 06:09:29 +04: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 9510fa9f6c Merge pull request #6711 from Crazylemon64/playercreation_assembly_line
Streamlines the ghost-to-player creation process
2017-03-09 21:30:22 -05:00
Crazylemon64 869c9b76c4 Streamlines the ghost-to-player creation process
Also refactors ERT equipment to be actual outfits instead of hardcoded
2017-03-08 05:49:49 -08:00
Markolie 3aa1399995 Implement usesound/toolspeed 2017-03-07 16:46:28 +01:00
davipatury af6db09309 Merge remote-tracking branch 'origin/master' into modular_computers 2017-03-04 15:44:20 -03:00
davipatury 67ee6fdd41 Laptop vendor, access tweaks and computer recipes. 2017-02-20 21:28:14 -03:00
uraniummeltdown 7628586ee6 adds mineral statues from TG, added statue recipes for minerals, breakdown sandstone->sand 2017-02-19 21:48:13 +04: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
uraniummeltdown 3e7dafe21a move all floor tiles to tiles.dmi, origin_tech materials=1 for base tile object, rename tranquillite tile item state 2017-02-06 21:41:39 +04: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 385db6d240 Merge remote-tracking branch 'remotes/upstream/master' into mineral
# Conflicts:
#	icons/obj/items.dmi
#	icons/turf/floors.dmi
2017-02-05 17:40:39 +04:00
Fox-McCloud 390f6768b3 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-02-05 05:26:46 -05:00
uraniummeltdown 5f2ef0ef7d mineral floors from TG
group silent tiles with mineral tiles
add tile recipes
add mineral floor tile stacks and turfs
add ability to weld mineral floor tiles
2017-02-05 10:46:24 +04:00
Markolie 063b5728ad Welp, revert glass airlock changes 2017-01-28 23:39:59 +01:00
Markolie f1f0f9358f Construction fixes 2017-01-28 23:28:32 +01:00
Markolie f7f08ae265 Enable construction of glass airlocks 2017-01-28 22:13:32 +01:00
Fox-McCloud 6d3ef6001f drying racks 2017-01-26 23:48:47 -05:00
Fox-McCloud b1f789e104 fixes a ton of thing 2017-01-24 03:23:16 -05:00
Fox-McCloud 5c828db250 fixes, comfrey, and aloe 2017-01-23 05:25:42 -05:00
Markolie d6276ae978 Tiger's comments 2017-01-22 19:15:26 +01:00
Fox-McCloud 706347fd84 even more work 2017-01-22 08:11:31 -05:00
Fox-McCloud ea76990b7a Botany Rework 2017-01-21 18:28:03 -05:00
Markolie f4c4bfe288 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
# Conflicts:
#	code/__HELPERS/unsorted.dm
#	code/_globalvars/lists/objects.dm
#	code/controllers/verbs.dm
#	code/game/gamemodes/cult/ritual.dm
#	code/game/gamemodes/cult/runes.dm
#	code/game/objects/items/stacks/sheets/sheet_types.dm
#	code/modules/mob/spirit/mask/mask.dm
#	code/modules/mob/spirit/viewpoint.dm
#	icons/effects/96x96.dmi
#	icons/effects/effects.dmi
#	icons/mob/actions.dmi
#	icons/obj/weapons.dmi
#	icons/obj/wizard.dmi
#	icons/turf/floors.dmi
2017-01-06 16:36:46 +01:00
Crazylemon64 ac612d4924 Fixes construction talisman
Fixes supply talisman
2017-01-06 04:32:59 -08:00
Aurorablade 113f2770e3 somethingsomethingcaffine 2017-01-06 06:33:12 -05:00
Aurorablade 7fb084d690 tries to address comments...
and will get them wrong.
2017-01-05 22:07:21 -05:00
Aurorablade 4b717c7712 BUILDABLE cult door... 2016-11-10 02:44:21 -05:00
Markolie f61cfb47b9 Part three: The Hierophant. Also minor fixes for the other bosses. 2016-10-24 21:39:40 +02:00
Markolie 52355cba9d Added Legion megafauna, updated weather and some minor other refactors/changes. 2016-10-24 02:16:45 +02:00
Markolie 2e711d1337 Lay groundwork for megafauna, and add Ashdragon.
Includes a refactor for gun turrets (merged into portable turrets), hostile simple_animal behaviour, spells (sounds have been added) and poi_list items.
2016-10-23 23:15:57 +02:00
Aurorablade e2ce799aa1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-10-08 22:21:48 -04:00
Fox McCloud c56961f6f0 Merge pull request #5642 from Krausus/UniqueIDs
Adds Unique Identifiers with Topic and VV Integration
2016-09-12 15:32:20 -04:00
GeneralChaos81 c5e9b0514f Redo of clown/mime door fix. 2016-09-12 20:11:54 +10:00
Krausus 92405288d2 UID mass replace: src=\ref[src] 2016-09-05 23:02:10 -04:00
Aurorablade b551345b73 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-08-24 20:49:20 -04:00
Fox-McCloud 43889a89d5 Ports Mining Shelters 2016-08-21 03:14:08 -04:00
Aurorablade c1e27c7436 updated 2016-08-16 17:53:47 -04:00
Fox-McCloud 989b629de4 crown and shoes 2016-08-08 19:36:41 -04:00
Fox-McCloud 2e69b0eec1 Removes More Del's 2016-08-01 21:24:38 -04:00
TheDZD bc98945c7a Merge pull request #5177 from Fox-McCloud/medical-stack-rework
Trauma and Burn Kit Rework
2016-08-01 21:03:07 -04:00
Fox McCloud f0531860d4 Merge pull request #5264 from tigercat2000/seriously_fox
Refactor stack recipes
2016-08-01 20:44:37 -04:00
Tigercat2000 1ff1ee0af3 for(var/i in 1 to recipe_list.len) 2016-07-31 07:42:48 -07:00
Tigercat2000 221476ef3b Refactor stack recipes
- Styling fixes
 - Added post_build() to stack recipes, for any recipes that need to do
   something special
   - Called with two arguments, the stack that it originated from, and the
     new object.
 - Moved stack recipes to their own file

Currently, only two things use post_build
 - Cablecuffs use it to color the cuffs the same as the wire they
   originated from
 - Metal rods use it to call update_icon, in order to display the correct
   sprite for whatever amount of rods you created.
2016-07-31 07:20:26 -07:00
Fox-McCloud bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
Fox-McCloud 1200ba6e5f tweaks 2016-07-28 17:20:52 -04:00