cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-14 08:34:16 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 10 Branches 2 Tags
dev-docs-readme
Commit Graph

2709 Commits

Author SHA1 Message Date
Mark van Alphen ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00
variableundefined 75a9ca9a10 Merge pull request #11397 from Arkatos1/cabinet 
Fire extinguisher cabinet QoL update
 2019-04-30 13:05:12 +08:00
Fox McCloud 7b57d2e319 fixups 2019-04-29 04:41:31 -04:00
Arkatos1 718d05f0fb Code review fixes 2019-04-28 20:27:45 +02:00
Arkatos1 3181843ce4 Code review fixes, no drop sanity check 2019-04-28 12:31:07 +02:00
Arkatos1 ce5cd16b7e Fire cabinet QoL update 2019-04-28 00:57:12 +02:00
Mark van Alphen 4423962a2a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/controllers/subsystem/mapping.dm
#	paradise.dme
 2019-04-26 23:07:57 +02:00
Mark van Alphen e4dd9110ee Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	paradise.dme
 2019-04-26 22:58:56 +02:00
Couls a8db26df98 Merge remote-tracking branch 'upstream/master' into diagonal-movement 2019-04-25 23:45:08 -04:00
Fox McCloud 0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Couls a188a6b890 change some move procs 2019-04-23 05:56:12 -04:00
Mark van Alphen c4dc5ecd3d Merge branch 'ambientocclusion' of https://github.com/Markolie/Paradise into lighting 2019-04-22 18:52:55 +02:00
Mark van Alphen 7fef96e38d Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	paradise.dme
 2019-04-21 23:27:23 +02:00
Fox McCloud d88411f947 Merge pull request #11255 from Markolie/safe 
Safe refactor
 2019-04-21 04:04:13 -04:00
Mark van Alphen 211468b24f Add fake ambient occlusion 2019-04-21 01:45:30 +02:00
Mark van Alphen c878f8e36e Lavaland code review fixes - also integrates flyswatter and cat toy 2019-04-20 00:24:58 +02:00
Mark van Alphen 09da967bd1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	_maps/map_files/RandomZLevels/moonoutpost19.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm
 2019-04-18 03:15:52 +02:00
Mark van Alphen 6faf9c769f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
#	paradise.dme
 2019-04-17 22:46:43 +02:00
joep van der velden 11abbd1ef2 Fixes windoors not spawning electronics once deconstructed 2019-04-17 12:09:20 +02:00
variableundefined eb83a2dee7 Merge pull request #11285 from Fox-McCloud/elecrocution-refactor 
Refactors Electrocution
 2019-04-16 19:47:42 +08:00
Fox McCloud 58a7107eae shocking animals 2019-04-12 16:03:18 -04:00
Mark van Alphen bfbebca770 Make sure images are qdel'd 2019-04-11 19:44:10 +02:00
Fox McCloud 93118f9d34 Remaps Toxins 2019-04-11 07:24:16 -04:00
Mark van Alphen c597c9be51 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/turfs/simulated/floor/plating.dm
#	code/modules/clothing/suits/jobs.dm
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
 2019-04-11 07:27:51 +02:00
Mark van Alphen 8c5847f9ea Code review fixes 2019-04-11 07:22:43 +02:00
Fox McCloud 90c9f3f479 Refacors Electrocution 2019-04-10 18:09:14 -04:00
Mark van Alphen f94796c125 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/items.dm
#	icons/turf/floors/plating.dmi
#	paradise.dme
 2019-04-10 21:54:54 +02:00
Ionward ba7491fa49 cleaned up and made all mantles a child of the base mantle 2019-04-09 02:54:06 -07:00
Ionward a792d46085 adds mantles! 3 public access ones (in default clothes vendor,) and 6 command ones, each in their respective heads' lockers. 2019-04-09 01:06:19 -07:00
Mark van Alphen dde5f1c04c Code review fixes 2019-04-07 18:48:34 +02:00
Mark van Alphen a045382fb3 Fixes 2019-04-07 00:42:44 +02:00
Mark van Alphen 6425d6cc40 Refactor tumbling mechanism 2019-04-07 00:34:02 +02:00
Mark van Alphen be92148517 Safe refactor 2019-04-06 23:20:26 +02:00
Fox McCloud 638c225397 Merge pull request #11140 from dovydas12345/Statues 
Removes a unneeded dot from diamond statue names
 2019-04-06 03:14:58 -04:00
Mark van Alphen a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2019-04-04 22:04:55 +02:00
Mark van Alphen 877cfc4d7d Refactor catwalks to not be floors, update chasms and fix Lavaboat 2019-04-04 22:01:25 +02:00
variableundefined 58f253ad33 Merge pull request #11156 from farie82/big-wrapper-fix 
Wrapping big objects and welding lockers now takes time
 2019-04-02 18:34:05 +08:00
Mark van Alphen 500675be77 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/game/objects/structures/safe.dm
 2019-04-02 00:54:49 +02:00
Fox McCloud 0b06a32cc9 Merge pull request #11165 from Markolie/issues 
Resolve some issues that the compiler doesn't spot
 2019-04-01 18:22:43 -04:00
Mark van Alphen c8cf58b341 Temporarily add the safe fix here, too 2019-04-01 19:47:31 +02:00
Mark van Alphen 8cdb41b835 Switch around random calls 2019-04-01 18:29:01 +02:00
Mark van Alphen d1f8adc724 Fix infinite loop in safes 2019-04-01 18:26:58 +02:00
Mark van Alphen ed153d3566 Add seed vault and animal hospital 2019-03-31 23:49:18 +02:00
Mark van Alphen 1689e46f1e Added Syndicate base and ported over turf decals 2019-03-31 20:26:02 +02:00
Mark van Alphen 45a066c7d1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	code/modules/food_and_drinks/recipes/recipes_grill.dm
 2019-03-30 22:55:09 +01:00
Mark van Alphen f92be2c67d Add Beach biodome ruin and other fixes 2019-03-30 22:48:11 +01:00
Mark van Alphen c370e08233 Port the actual Lavaland map (and associated fixes) 2019-03-30 04:12:37 +01:00
Mark van Alphen fb337f2825 Port over Lavaland mobs and turfs (not finished) 2019-03-29 23:45:36 +01:00
Mark van Alphen b8e840c094 Resolve some issues that the compiler doesn't spot 2019-03-29 16:21:15 +01:00
joep van der velden 7f8837723f target dun exist and user 2019-03-29 09:05:30 +01:00