Commit Graph

2374 Commits

Author SHA1 Message Date
ZomgPonies f7f599b431 Xenos fixes 2014-02-28 18:54:54 -05:00
alex-gh 2995c688a1 minor map fixes 2014-02-24 00:48:56 +01:00
Lokiamis 544c39f7c2 salvage
Conflicts:
	code/game/jobs/access.dm
	code/game/objects/items/weapons/cards_ids.dm
	maps/tgstation.2.1.0.0.1.dmm
2014-02-16 10:38:52 -05:00
SamCroswell 3634ff942b /TG/ Cards Ported, new card deck added 2014-02-11 23:22:30 -05:00
Fox-McCloud 963dbaee6b Re-implementation
Makes the AI's voice more "AI"-like, adds a title screen, enables end of
the round sound-byte quips, and enables two additional songs during
pre-game
2014-02-08 23:47:06 -05:00
SamCroswell 2666e893e5 More admin room updates 2014-02-08 20:01:43 -05:00
SamCroswell 4101ce7b5d Admin room revamp 2014-02-08 13:35:35 -05:00
SamCroswell be3c95a9ff Changes 'n shit 2014-02-07 18:43:48 -05:00
SamCroswell bd26d1b0b7 Various Pulse Rifle Fixes 2014-02-06 23:10:02 -05:00
SamCroswell 7442282b08 Ninja and DS Mass Driver fixes 2014-02-05 23:02:44 -05:00
SamCroswell 0e20cec0d4 Various Map / Ninja Fixes 2014-01-30 23:39:14 -05:00
SamCroswell 76840fae78 Additional Select Equiptment Option, More Areas 2014-01-29 17:03:14 -05:00
SamCroswell 673948a003 Preparing Ninjas to be implemented
Tweaks and fixes, as well as the removal of some of my unfinished works,
to Ninja so in preparation for their implementation. Also a few Telesci
fixes.
2014-01-28 12:38:00 -05:00
SamCroswell 540a33b5e0 Deadeagle's Changes
Deadeagle made some changes to the map, uploading them
2014-01-27 15:56:54 -05:00
SamCroswell cf7e3683ec Telescience Layout Change 2014-01-26 03:02:33 -05:00
SamCroswell 86ad8a5a17 Drugs/Minor CentComm Updates 2014-01-22 22:26:01 -05:00
ZomgPonies 35bb181d23 Merge pull request #123 from SamCroswell/master
Ninja Teleport Quickfix, ERT Armory now has a blast door
2014-01-21 20:12:10 -08:00
SamCroswell 7facce411c Ninja Quickfix, ERT Armory now has a blast door 2014-01-21 23:04:50 -05:00
Rob Nelson 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 Nelson 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 Nelson 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
ZomgPonies cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -05:00
ZomgPonies 65d023dd93 Facehugger to Full alien, all player controlled 2014-01-19 16:45:20 -05:00
SamCroswell d498adb324 Ninja / CentComm changes 2014-01-18 00:34:24 -05:00
ZomgPonies bb7b4b3fb8 Door permission fix 2014-01-16 21:50:35 -05:00
ZomgPonies 2525a3d057 Added barber karma job 2014-01-16 08:42:36 -05:00
ZomgPonies 6dbf776ff4 Gamme to shuttle, part two 2014-01-16 06:57:17 -05:00
ZomgPonies 67897d2f41 Switching Gamma to a shuttle, part one 2014-01-16 06:15:34 -05:00
ZomgPonies 90909b304a Merge pull request #116 from SamCroswell/master
EXTREMELY buggy Ninja code
2014-01-16 01:52:19 -08:00
ZomgPonies 42f286f210 Fixing Gamma armory exploits 2014-01-15 13:06:47 -05:00
ZomgPonies e9c3484a52 Layering fail 2014-01-15 09:47:18 -05:00
SamCroswell 51a4a6ee4f EXTREMELY buggy Ninja code 2014-01-14 23:58:21 -05:00
ZomgPonies 6b702eaefa More map fixes 2014-01-12 02:51:56 -05:00
ZomgPonies ab8422f5aa More hull resistance tuning 2014-01-11 06:01:30 -05:00
ZomgPonies c9af26ce1f First part of replacing all exterior facing windows with reinf plasma glass 2014-01-11 02:49:51 -05:00
SkyMarshal 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 6aa9c677f9 Moved the CoC 2014-01-07 01:54:49 -05:00
ZomgPonies aa8fcc9b15 Randomized lawset system + config options 2014-01-05 17:50:13 -05:00
ZomgPonies bbc0fb56a4 Catwalks redux first pass 2014-01-03 23:28:24 -05:00
ZomgPonies 9b653e8bb8 Merge pull request #102 from SamCroswell/master
Admin Room Upgrade, Kamikaze Fix
2014-01-03 11:17:27 -08:00
ZomgPonies 7bbf936f45 Added space cleaner refiller 2014-01-03 14:09:30 -05:00
SamCroswell 801167244b Abandoned Cargo Station Update 2014-01-03 05:11:15 -05:00
SamCroswell 87f1b1728e Kamikaze fix / Admin room upgrade 2014-01-02 08:00:00 -05:00
ZomgPonies a0d866b366 Popable cans and beer cans 2013-12-31 21:44:21 -05:00
ZomgPonies b04299c09c Merge pull request #101 from SamCroswell/master
Ninjas can no longer cloak with a sword, SpiderOS updates, map fixes
2013-12-29 09:13:13 -08:00
SamCroswell fc0764770a NinjaSpawn removal
Somthing has gone horribly wrong with NinjaStart, and so I've reverted
to using CarpSpawn for now.
2013-12-29 01:07:22 -05:00
ZomgPonies 726fa55cca Merge pull request #99 from SamCroswell/master
Space Ninja Spawn and Stealth Glove Fix
2013-12-25 03:56:32 -08:00
SamCroswell 11949f1b0f Space Ninja Spawn and Stealth Glove Fix 2013-12-23 19:39:50 -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