cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,806 Commits 14 Branches 2 Tags
master
Commit Graph
472 Commits
Author SHA1 Message Date
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
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
Markolie d6276ae978 Tiger's comments 2017-01-22 19:15:26 +01: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
GeneralChaos81 c5e9b0514f Redo of clown/mime door fix. 2016-09-12 20:11:54 +10: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
Fox McCloudandGitHub f0531860d4 Merge pull request #5264 from tigercat2000/seriously_fox 
Refactor stack recipes
 2016-08-01 20:44:37 -04: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
Tom HeerenandGitHub 9e4b00bd0d Fixes cardboard boxes confusion 2016-07-25 14:42:07 -05:00
monster860 009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
monster860 3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Tigercat2000 71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
TheDZD f17f4ccdeb Crossbows and piescannons 2016-06-02 22:17:19 -04:00
TheDZD a4e950d21a Compiles, and guns work™ 2016-05-31 22:50:55 -04:00
Fox-McCloud 2453735d3f part 2 2016-04-17 00:21:31 -04:00
Fox-McCloud f817351d2a part1 2016-04-16 10:40:21 -04:00
TheDZD eba294357a It's the bees 2016-04-14 20:30:30 -04:00
Tigercat2000 dd79aaa967 Merge remote-tracking branch 'upstream/master' into to_chat 
Conflicts:
	code/game/machinery/door_control.dm
 2016-04-05 21:10:36 -07:00
FalseIncarnate 8a558a7c96 Merge Conflict 2016-04-05 19:26:30 -04:00
FalseIncarnate 40ee9bb99d Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into logic 2016-04-05 19:15:11 -04:00
Tigercat2000 78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000 9d430844c3 Replace most (if not all) output << operators with to_chat(user, message) 
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
 2016-04-05 08:15:05 -07:00
ProperPants 0f9797a7c2 Cyborg wood is gone. I don't know why it was there in the first place. 2016-03-31 08:18:39 -04:00
ProperPants b764f18840 I forgot to change the cyborg modules back to normal for the tiles. 2016-03-30 22:16:09 -04:00
ProperPants 2b4456c12f Cleaned up some cyborg stacks to take almost everything from the parent. 2016-03-30 22:13:28 -04:00
Fox McCloud 0f8085e1d8 Merge pull request #3980 from Aurorablade/ArtsAndCrafts 
Fethas Carnival of Horrors:Rusty Iron Chef
 2016-03-30 16:25:27 -04:00