cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-01 18:23:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 9 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

17074 Commits

Author SHA1 Message Date
Tigercat2000 008cf4d365 Adds pref SOUND_HEARTBEAT 2015-03-17 17:30:28 +01:00
Markolie 83e2a4cea1 Cryopod update 2015-03-17 16:33:09 +01:00
Markolie 747c2f9a57 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	code/game/turfs/simulated/floor.dm
 2015-03-17 16:18:42 +01:00
Markolie 12aaa6a93e Bug fixes 2015-03-17 16:16:44 +01:00
Tigercat2000 07e9b18f6c Compile and Runtime fixes. 2015-03-17 15:35:47 +01:00
volas c599d4ce7b Additional checks for heartbeat, reduced volume 2015-03-17 15:17:15 +01:00
volas 303a52fdfa Port Heartbeat from Baystation12(#8386) 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2015-03-17 15:13:38 +01:00
ZomgPonies 09d8e839ef Merge pull request #582 from Fox-McCloud/Escape-Pods 
Escape Pod Fixes and Tweaks
 2015-03-17 08:29:40 -04:00
ZomgPonies 05d09a4c5a Merge pull request #581 from tigercat2000/TajaEatMice 
Let Tajaran eat mice!
 2015-03-17 08:24:01 -04:00
ZomgPonies ad4135e170 Merge pull request #580 from Fox-McCloud/Explosions 
Explosion Tweaks and Fixes
 2015-03-17 08:22:15 -04:00
Fox-McCloud 9fef88f347 Implant Cleanup 2015-03-17 06:30:54 -04:00
Fox-McCloud d3faf75a4d Changes. 2015-03-17 05:27:05 -04:00
ZomgPonies 854fd74622 Merge pull request #578 from tigercat2000/SpacePodEMP 
EMP_Act for spacepods, disables movement, eats cell charge, largely
 2015-03-16 18:38:18 -04:00
Markolie 1cb3e38b65 Update saw-off code 2015-03-16 19:36:40 +01:00
Markolie abd7e00ab0 Photocopier fix 2015-03-16 18:56:51 +01:00
Markolie 23bae14e9c Fix monkeys picking up intercoms 2015-03-16 18:52:33 +01:00
Markolie cacc2bf917 Fixes 2015-03-16 18:49:47 +01:00
Fox-McCloud 604b4bb28a Escape Pod Fixes 2015-03-16 02:18:35 -04:00
Tigercat2000 e8fb990a5b Properly integrate and stoof 2015-03-16 03:11:22 +01:00
Tigercat2000 6d594204a3 Let Tajaran eat mice! 2015-03-16 02:53:56 +01:00
Fox-McCloud 554ad70699 Dead Gibbing 2015-03-15 20:09:43 -04:00
Fox-McCloud 645167b49a Explosion Tweaks and Fixes 2015-03-15 18:05:13 -04:00
Fox-McCloud d266436143 Merge pull request #570 from tigercat2000/NanoUIPool 
NanoUI for Pool-Controller! (never again)
 2015-03-15 16:59:30 -04:00
Fox-McCloud b001107a3c Merge pull request #579 from TheDZD/changeling 
Minor Fixes
 2015-03-15 16:59:00 -04:00
Fox-McCloud a31cdc9091 Merge pull request #572 from SamCroswell/NinjaDev 
Ninja Restructure
 2015-03-15 16:58:41 -04:00
Tigercat2000 47d5fbaa4d Optimizing code, WIP 2015-03-15 20:55:47 +01:00
DZD f5fd826e55 Minor Fixes 
- Fixes xeno sentinel and hunter health HUDs, forgot to update these
when I changed their health.
- Changeling regen stasis renders the changeling unconscious and blind.
 2015-03-15 13:18:27 -04:00
Tigercat2000 0ab1a02ac8 EMP_Act for spacepods, disables movement, eats cell charge, largely 
impacts health, also makes ion rifles work correctly against pods
 2015-03-15 17:59:22 +01:00
SamCroswell 62ae69c816 Ninja File Structure Rework 
Restructures the ninja files into a more spaced-out version, compliments
of /TG/. The energy katana is also their handiwork.

Add an emag act to crates and lockers instead of handling everything in
attackby.
 2015-03-13 20:42:54 -04:00
Tigercat2000 e0f2c1ac78 Fix according to MarkvA's comments 2015-03-12 21:55:20 +01:00
Tigercat2000 811bf57d22 NanoUI for Pool-Controller! (never again) 2015-03-12 19:51:27 +01:00
ZomgPonies f7c1fe8229 Hurr durr derpydidurr 2015-03-11 23:35:15 -04:00
ZomgPonies adb54f4a06 Cryopod fixes 2015-03-11 18:08:01 -04:00
ZomgPonies c693be1c57 Merge pull request #548 from tigercat2000/SlimeColorChanger 
Allows slime people to change color in lobby.
 2015-03-11 16:53:29 -04:00
Tigercat2000 b3c5963e3e Fix weirdness with datacore rendering HAS_SKIN_COLOR races as default 
color
 2015-03-11 17:24:04 +01:00
Tigercat2000 7da4efc494 Fix proc/update_preview_icon as well as ID images for colored slime people 2015-03-11 16:18:34 +01:00
Mark van Alphen bee7dc659b Merge pull request #550 from ZomgPonies/master 
Blueshield Balance Changes
 2015-03-11 14:26:14 +01:00
Mark van Alphen 9fa5faafab Merge pull request #552 from ZomgPonies/table 
Balancing out tableclimbing
 2015-03-11 14:26:04 +01:00
ZomgPonies 25d79df91a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-03-10 18:29:57 -04:00
FalseIncarnate 1f9c11b194 Kitchen Overhaul Fixes 
Fixes all cotton candy flavors/colors utilizing the plain version's
sprite.

Fixes fixing kitchen machines (candy maker, grill, oven, microwave) with
a wrench attempting to unfasten/refasten them to the ground.  You can
only unfasten these machines if they are not broken now.
 2015-03-10 01:50:30 -04:00
ZomgPonies fe2ffc16de Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 2015-03-09 23:51:01 -04:00
Fox-McCloud 7f239d6dbc Merge pull request #551 from ZomgPonies/random 
No more randomly weird colored species
 2015-03-09 23:26:17 -04:00
ZomgPonies 66dd040130 Gives the ability to stop someone climbing a table 2015-03-09 22:55:30 -04:00
ZomgPonies d1587addaf No more crazy random colors 2015-03-09 22:32:14 -04:00
SamCroswell addfbe449e Adds Shuriken 2015-03-09 21:28:28 -04:00
ZomgPonies b51850dfdd Blueshield access change 2015-03-09 19:01:42 -04:00
Tigercat2000 e0582bbd46 Revert global.dm changes, didn't mean to commit them 2015-03-09 22:56:01 +01:00
Tigercat2000 1c88cec5b1 Merge branch 'master' of github.com:ParadiseSS13/Paradise into SlimeColorChanger 2015-03-09 22:25:35 +01:00
Tigercat2000 ec8a35d544 Pool fixes, sanity checks. 
Updates pool code so that it doesn't affect ghosts, AI eyes, and silicone,
also changes the message to only display on prob(50), to cut down on the
message spam
 2015-03-09 19:40:43 +01:00
ZomgPonies 4d1c80b7d9 Merge pull request #535 from FalseIncarnate/master 
Kitchen Overhaul
 2015-03-09 13:40:49 -04:00