cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-04 06:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,146 Commits 26 Branches 2 Tags
c878f8e36ea57d7283deba210ef0d8e79addcc9f
Commit Graph

1738 Commits

Author SHA1 Message Date
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
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
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
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
joep van der velden
591b6b093f spacing 2019-03-28 23:29:36 +01:00
joep van der velden
b8a414a5c4 Also welding takes time now + usr 2019-03-28 23:26:57 +01:00
Fox McCloud
d0ea5ee8b9 Crit Rework Final Submission 2019-03-28 17:28:00 -04:00
Dovixx
1e388140e7 Change it 2019-03-26 18:59:53 +02:00
variableundefined
85ab7a8b06 Merge pull request #11065 from Fox-McCloud/pill-bottles-and-patch-packs 
[Goonchem] Pills, Bottles, Patches, and Pillbottles
 2019-03-24 17:51:00 +08:00
variableundefined
4ca33bb19d Merge pull request #11078 from Fox-McCloud/goonchem-reagent-temperature 
[Goonchem] Reagent Temperature and Pyrotechnics
 2019-03-24 17:50:07 +08:00
joep van der velden
f903290e1c better way 2019-03-24 07:59:39 +01:00
farie82
c05103c3f2 comments be gone 2019-03-23 15:18:00 +01:00
joep van der velden
f4168349e2 correct inflatable deflate items 2019-03-23 15:16:59 +01:00
joep van der velden
d04254a668 fixes more 2019-03-23 15:10:58 +01:00
joep van der velden
8b0334209d fixes the inflatable bug as well 2019-03-23 14:44:37 +01:00
joep van der velden
bc86d26058 fixed the atmos not updating 2019-03-23 14:38:27 +01:00
Fox McCloud
277722508a [Goonchem] Reagent Temperature 2019-03-18 20:06:15 -04:00
Fox McCloud
d8fce5bcdb don't map things in when you can add them to the code 2019-03-17 23:31:53 -04:00
Fox McCloud
d61bbe807d [Goonchem] Pills, Bottles, Patches, and Pillbottles 2019-03-17 21:30:10 -04:00
datlo
951f9c4928 add "voice" option to magic mirror 2019-02-22 02:05:34 +00:00
datlo
4ca61d45de Update vendor items, update map for botany/xenobio 2019-02-04 02:10:40 +00:00
datlo
f06e88d82d Remove base access from golem ID, buff golem KA 2019-02-03 14:35:11 +00:00
datlo
74a3631741 compilin and mostly workin 
has runtimes due to body color
need to wrap up commented procs
 2019-02-03 06:40:50 +00:00
datlo
f98da3edf8 Progress... 2019-02-02 17:51:25 +00:00
Aurorablade
d3448cf287 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into EXTERMINATUSPARTONE 2019-01-29 17:42:39 -05:00