cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-17 00:57:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
19,669 Commits 17 Branches 2 Tags
95e18fd397cceaaa793c0fa7cf415f19b07fa367
Commit Graph
135 Commits
Author SHA1 Message Date
Markolie cbc8be2b4f Fax stamp update 2015-02-14 17:20:18 +01:00
Markolie 9fed8135d4 Handcuff refactor, IV drip fix 2015-02-14 04:35:32 +01:00
Mark van Alphen 8e7ddbf550 Fix step_y in station collision 
Fixes step_y in the station collision map to satisfy Travis.
 2015-02-12 10:37:57 +01:00
Mark van Alphen c8d339e2b9 Fix step_y in space hotel 
Fixes the step_y in the space hotel away mission to satisfy Travis.
 2015-02-12 10:36:21 +01:00
Markolie 7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
Markolie 1d55d8ee32 Fix away mission atmos 2015-01-18 03:08:29 +01:00
Markolie 6dbb4c4881 Listening Post fix, typo fix, mapfix 2015-01-17 04:28:35 +01:00
Markolie b9ccb857d0 Energy gun description fix, UO45 fix, temporarily disable the engi shuttle 2015-01-17 01:05:23 +01:00
Markolie 60e18d0c0e Major map overhaul, remove customs officer/nanotrasen recruiter 2015-01-12 02:23:45 +01:00
Markolie 1c6c3a3be1 Add undergroundoutpost45 2015-01-11 07:47:37 +01:00
Markolie bc34fc25bd Change default away missions 2015-01-11 07:46:19 +01:00
Markolie 90cb55ea84 Re-enable clown planet 2015-01-11 07:43:31 +01:00
Markolie 042ac20d5e Remaining 3 /tg/ away missions 2015-01-11 07:41:12 +01:00
Markolie ae54430e6a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise 
Conflicts:
	maps/cyberiad.dmm
 2015-01-10 06:24:55 +01:00
Markolie ced499edc3 Vox Heist port from Bay 2015-01-10 06:21:21 +01:00
Markolie c70a6c172b Away mission port from /tg/ 2015-01-09 00:12:16 +01:00
SamCroswell 47a072742e Removes Snowmobiles, Fixes Ion Inhand 2014-12-14 16:46:42 -05:00
Fox-McCloud c879ead4f7 Music Updates 2014-10-31 21:55:25 -04:00
ZuhayrandZomgPonies 7c07240ac9 Integrated crossbows/pneumatic cannons into launcher gun type, added back sprites. 
Conflicts:
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/alien.dm
	code/modules/projectiles/guns/projectile/crossbow.dm
	code/modules/projectiles/guns/projectile/pneumatic.dm
	icons/mob/back.dmi
	maps/tgstation2.dmm
 2014-07-21 06:10:45 -04:00
ZomgPonies 08b69878f7 Only atmosia flag left to do! 2014-05-24 12:27:55 -04:00
ZomgPonies 769214e535 Refactored flags, added in excellent Clown Planet flag by Wubbledaddy 2014-05-24 07:48:29 -04:00
SamCroswell f4ef7c192b Map changes, new Ninja masks 
Map changes including: RnD layout change, new customs lounge, xenoarch
windows fix, and more. Also added a few new Ninja masks in prep for some
bigger changes I have planned.
 2014-05-03 18:35:10 -04:00
HeredthandZomgPonies 5d77dcecaa Added new vending machines, and changed a couple of other files. Might be worth looking through just to make sure I didnt fuck everything up 
Conflicts:
	code/game/machinery/vending.dm
 2014-03-11 06:11:12 -04:00
Rob NelsonandZomgPonies 7892eeb7cc Standardize LASER, NOCLONE, and HUSK 
Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
	code/modules/mob/living/carbon/human/death.dm
	maps/RandomZLevels/wildwest.dm
 2014-01-21 22:59:53 -05:00
Rob NelsonandZomgPonies dd8c8c12ab Standardize XRAY. 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	maps/RandomZLevels/wildwest.dm
 2014-01-21 22:37:37 -05:00
Rob NelsonandZomgPonies 95cc6a27b5 Standardize mutation constants, remove ambiguity, remove non-implemented muts. 
Conflicts:
	code/_onclick/click.dm
	code/game/dna/genes/powers.dm
	code/game/machinery/wishgranter.dm
	code/modules/mob/living/carbon/alien/alien.dm
	code/modules/mob/living/carbon/alien/humanoid/life.dm
	code/modules/mob/living/carbon/alien/larva/life.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_movement.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/monkey/life.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/damage_procs.dm
	code/modules/mob/living/living.dm
	code/modules/power/lighting.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/setup.dm
	maps/RandomZLevels/wildwest.dm
 2014-01-21 22:36:19 -05:00
SkyMarshalandZomgPonies e2bbbb7e39 Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed. 
Conflicts:
	code/modules/mining/mine_turfs.dm
 2014-01-09 20:56:38 -05:00
ZomgPonies 03f89b184f Removing all the old shitty maps from the fork for now. 2013-12-23 03:35:57 -05:00
ZomgPonies 66e42a8e9b Adds snowmen, walruses and seals to clown planet. 2013-12-22 10:27:05 -05:00
ZomgPonies 04a00e067f Added sarcophagai to clown planet 2013-12-22 10:00:36 -05:00
ZomgPonies 0bfeb40449 Had to funpolice HONK mech and snowmobiles because players. 2013-11-29 07:50:54 -05:00
ZomgPonies 064782ffaa Addes snowmobiles to clown planet because HONK 2013-11-27 09:19:07 -05:00
Cheridanandalex-gh 7bdeb898fc Makeshift weapons integration 2013-11-27 02:50:34 +01:00
ZomgPonies faa59ae433 Added frozen overlay to airlocks, yay clown planet 2013-11-24 00:23:39 -05:00
ZomgPonies e9dec4df5c Tribbles can be turned into fur products, you monster. 2013-11-23 03:07:39 -05:00
ZomgPonies e837130d9e Tuning 2013-11-22 13:02:03 -05:00
ZomgPonies 379d6851f3 Trouble in Tribble Town 2013-11-21 21:23:54 -05:00
ZomgPonies 0faab50c64 Mime love -- Baguette-shooting french crossbow 2013-11-21 09:28:45 -05:00
ZomgPonies dd881dd434 Mime love -- Greyscale Transformer 2013-11-21 08:57:57 -05:00
ZomgPonies 383b0c6f64 Clown Planet bugfixes 2013-11-21 06:44:37 -05:00
ZomgPonies 52907cdb23 Fixed and working clown planet 2013-11-21 03:03:04 -05:00
ZomgPonies 859ed8bf38 Clown Planet V2 2013-11-20 21:47:00 -05:00
ZomgPonies bd48e4c80b Added Chinese Restaurant and barber shop updates, plus some bugfixes 2013-11-02 18:23:07 -04:00
ZomgPonies 9d8dc3bf57 New Stamp Code + Map updates 2013-10-31 08:35:38 -04:00
ZomgPonies 7048545d6d Projectile code overhaul 2013-10-30 10:32:21 -04:00
ZomgPonies dadbd68741 Clownplanet update + minemech broken sprites 2013-09-26 06:46:02 -04:00
ZomgPonies 301a782181 Clownplanet map updates 2013-09-24 19:00:56 -04:00
ZomgPonies 6a8c00ea94 New clownplanet -> Gateway 2013-09-22 20:00:44 -04:00
Mloc 59821a2174 examples for fileList.txt 2013-08-12 13:55:54 +01:00
comma 1bca7c7454 Made character HUD show pain level instead of actual health. 
Pain are calculated based on health, but all damages contribute differently, for example 50u burn will feel like 100u, but 50u poisoning would only feel like 25u.
 2013-08-04 00:12:38 +04:00