cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 23:48:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
48,072 Commits 14 Branches 2 Tags
93db61665d1cd0de0b2906c78129461bfbabbde8
Commit Graph
733 Commits
Author SHA1 Message Date
Couls b1dd4d5496 use fox's code 2019-08-29 20:41:12 -04:00
Shadow a4b3030e4a mfw I forget to anchor 2019-08-29 19:14:21 -05:00
Shadow aab72a5d5c 3 big 5 me 2019-08-29 18:22:04 -05:00
variableundefinedandGitHub b75db54b1f Merge pull request #12015 from SteelSlayer/atmos-QoL 
Atmos tech QoL & Disposal pipe tweaks
 2019-08-28 11:14:17 -04:00
Fox McCloud 9f2f9cfa6c Merge remote-tracking branch 'upstream/master' into ports-tailoring 2019-08-27 18:23:11 -04:00
variableundefinedandGitHub 722df75be4 Merge pull request #12090 from Fox-McCloud/jetpack-upgrade 
Ports Jetpack Upgrades. Removes Jetpack Suit Storage
 2019-08-27 17:39:19 -04:00
Fox McCloudandGitHub 0b46603e38 Merge pull request #12078 from SteelSlayer/paramedic-hand-defib 
Adds a handheld defibrillator to the paramedic EVA closet
 2019-08-27 02:40:31 -04:00
Fox McCloud eef0bc919d Implements Tailoring 2019-08-26 17:41:39 -04:00
Fox McCloud 899eb9c948 Ports Jetpack Upgrades. Removes Jetpack Suit Storage 2019-08-26 00:11:42 -04:00
Fox McCloud 9a4834a565 Merge remote-tracking branch 'upstream/master' into hardsuit-helmet 2019-08-25 18:15:10 -04:00
variableundefinedandGitHub 8269bc525e Merge pull request #11941 from farie82/examine-info 
Adds tips to certain things + general fixes that for issues I across
 2019-08-25 16:53:49 -04:00
SteelSlayer e1f4a08c54 Adds hand defib to the paramedic EVA closet 2019-08-25 00:49:02 -04:00
Fox McCloud cb6df7092c Hardsuit Helmets Integration 2019-08-24 18:36:27 -04:00
Couls 8715878a67 Fix cardboard box walldash 2019-08-22 16:51:07 -04:00
SteelSlayer e0a34a179b Adds destination tagger to atmos locker 2019-08-17 13:07:35 -04:00
variableundefinedandGitHub f82adc1310 Merge pull request #11937 from farie82/Borgs-crate-rig-fix 
Rigging a crate now costs 15 coils instead of deleting your stack
 2019-08-16 00:33:20 +08:00
farie82andGitHub 00d7eb7c3f Update crates.dm 2019-08-15 18:16:50 +02:00
Arkatos1 bddc7132c2 Merge https://github.com/ParadiseSS13/Paradise into pillbottle 2019-08-12 16:36:43 +02:00
variableundefinedandGitHub f6505a6fd5 Merge pull request #11819 from Kyep/medals 
Department Medals
 2019-08-12 17:52:22 +08:00
farie82andGitHub b4ed42155b return 2019-08-07 08:43:32 +02:00
joep van der velden 0ab00bb9ff More refactor + wrong item used fix 2019-07-29 21:18:42 +02:00
joep van der velden ab94782f56 Fire axe code refactor + tooltip 2019-07-29 21:07:12 +02:00
joep van der velden b46e970327 Better fix now. Use 15 wires using use() 2019-07-29 00:31:22 +02:00
joep van der velden 2bddeb7fde Borgs can't rig crates anymore with cable coil 2019-07-29 00:08:35 +02:00
Mark van Alphen fd579015b1 Portal fixes - adds oldloc to Crossed() 2019-07-15 20:16:17 +02:00
Kyep fd389810f2 medals in lockers 2019-07-10 20:13:14 -07:00
Arkatos1 de9da04572 Standardized colors, finished change wrapper choosing and modified templates and their sizes 2019-06-30 19:46:13 +02:00
Arkatos1 16a81d2527 Merge https://github.com/ParadiseSS13/Paradise into pillbottle 2019-06-30 16:09:38 +02:00
Arkatos1 d33d018e62 Finished colors for other prespawned pillbottles, new colors, finished template for changing wrappers in chemmaster 2019-06-30 16:08:33 +02:00
Mark van Alphen 35b1cee88b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs 
# Conflicts:
#	icons/obj/toy.dmi
 2019-05-03 18:31:45 +02:00
Unknown 0d81c2da7c Adds Pig Crate 2019-05-01 14:19:43 -05: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
Fox McCloud 0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04: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 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
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
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 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
variableundefinedandGitHub 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 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
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
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