Commit Graph

628 Commits

Author SHA1 Message Date
Mloc-Argent fcdcef5931 human: move organ generation into a species proc
New proc: /datum/species/create_organs
Called in set_species when no organs exist or it's forced.
Also shuffled set_species around a bit, adding a var to human/new to
specify a species to start as.
Should fix the adminspawn vox organ runtime.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/organs/organ.dm
2014-04-28 21:09:45 -04:00
Rob Nelson 56d8ce28c8 Part 1 of economy rework: Spacecash refactor - See commit for full changelog.
* Implements stacking and stack overlays
 * Simplified tiers of cash (1,10,100,500,1000, may remove 500)
 * Simplified API (dispense_cash, count_cash)

Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/admin/verbs/debug.dm
	code/modules/economy/ATM.dm
2014-04-19 20:47:41 -04:00
Rob Nelson 9227481a8a Standardize windows.
Conflicts:
	code/WorkInProgress/buildmode.dm
	code/game/machinery/doors/airlock.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/twohanded.dm
	code/game/objects/structures/window.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/simple_animal/constructs.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
2014-04-19 19:36:33 -04:00
MrPerson 5bb608e56e Redo of jitteriness and dizziness.
Fixes #2923

Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_defines.dm
	code/modules/reagents/Chemistry-Reagents.dm
2014-02-28 22:21:33 -05:00
d3athrow 1e95f6e641 Ragin mages
Conflicts:
	config-example/config.txt
2014-02-28 19:45:02 -05:00
ZomgPonies 1358b11e46 ZAS overhaul 2014-02-22 23:10:37 -05:00
Rob Nelson 5ce97a7d25 More DNA fixes. 2014-02-07 20:56:21 -05:00
SamCroswell bd26d1b0b7 Various Pulse Rifle Fixes 2014-02-06 23:10:02 -05:00
ZomgPonies d7194e7ca0 Merge pull request #143 from SamCroswell/master
Ninja HUD/Messneger Update
2014-02-01 16:48:45 -08:00
SamCroswell 3b515d1899 Ninja HUD Implemented, Thanks Wisewill! 2014-02-01 19:36:00 -05:00
ZomgPonies 0445af4196 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-01-31 02:51:21 -05:00
Jordie0608 7ab1aac59e Outright removed toggle admin jump,spawn and revive buttons
Conflicts:
	code/controllers/configuration.dm
	code/modules/admin/admin_verbs.dm
	code/modules/admin/topic.dm
2014-01-31 02:47:04 -05:00
ZomgPonies 88ee7313b5 Merge pull request #139 from SamCroswell/master
Additional Select Equiptment Option, More Areas
2014-01-30 23:46:47 -08:00
SamCroswell 12ffdb84bd PDA icon fixes, various fixes to select equipt 2014-01-29 17:24:51 -05:00
SamCroswell 76840fae78 Additional Select Equiptment Option, More Areas 2014-01-29 17:03:14 -05:00
Zuhayr 8c5ad54e0f Recommitting a ton of files as one commit due to needing to reset this repo to an earlier point in the log. Full changes in PR.
Conflicts:
	code/game/objects/items/weapons/implants/implant.dm
	code/modules/admin/verbs/vox_raiders.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/monkey/diona.dm
	code/modules/mob/living/carbon/species.dm
2014-01-28 15:30:20 -05:00
ZomgPonies 7014f6f83e More fixes to text2speech 2014-01-27 16:58:52 -05:00
Rob Nelson 1f30243a08 Refactor the fuck out of theft objectives. No more stealing your own jumpsuit.
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/objective.dm
	code/modules/mining/money_bag.dm
	code/modules/mining/ores_coins.dm
	html/changelog.html
2014-01-24 12:16:57 -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 d49e6d3bf4 Standardize CLUMSY
Conflicts:
	code/game/jobs/job/civilian.dm
	code/game/objects/items/weapons/defib.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/reagents/reagent_containers/syringes.dm
2014-01-21 22:49:22 -05:00
Rob Nelson 6091d16262 DNA panel fixed, update changelog.
Conflicts:
	html/changelog.html
2014-01-20 11:43:07 -05:00
Rob Nelson 5f89171fc1 Hopefully fix all DNA corruption issues caused by assuming datum pass by-val.
Conflicts:
	code/modules/mob/transform_procs.dm
2014-01-20 01:52:08 -05:00
Rob Nelson 1b2d09bb2d More fixings.
Conflicts:
	code/game/machinery/computer/medical.dm
2014-01-20 01:09:03 -05:00
Rob Nelson 6013605aa6 Add back in /fail/station's DNA dickery panel, fix missing block shifting.
Conflicts:
	code/modules/admin/verbs/debug.dm
2014-01-20 01:05:52 -05:00
Rob Nelson dae08eb061 Add back in /fail/station's DNA dickery panel, fix missing block shifting.
Conflicts:
	code/modules/admin/verbs/debug.dm
2014-01-20 01:03:42 -05:00
Rob Nelson dc60cc1726 DNA modifiers work now.
Conflicts:
	code/defines/obj/hydro.dm
	code/game/machinery/cloning.dm
	code/game/machinery/hydroponics.dm
	code/modules/mob/living/carbon/zombie/zombie.dm
	code/modules/mob/transform_procs.dm
2014-01-20 00:54:46 -05:00
ZomgPonies 65d023dd93 Facehugger to Full alien, all player controlled 2014-01-19 16:45:20 -05:00
YotaXP b7efb1b7ed Optimized and refactored list2text, text2list, and replacetext.
Also fixed some grammar in the station blueprint code.

Conflicts:
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/admin/verbs/debug.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/ai/say.dm

Conflicts:
	code/modules/admin/verbs/debug.dm
	code/modules/detectivework/scanner.dm
2014-01-08 07:14:16 -05:00
d3athrow 64d8903802 Following /tg/'s lead, removes set background 1 for smoother gameplay.
Conflicts:
	code/game/objects/effects/glowshroom.dm
	code/modules/mob/living/carbon/zombie/zombie.dm
	code/modules/mob/living/silicon/mommi/life.dm
2014-01-08 01:25:20 -05:00
SamCroswell 4121e924c6 Major Ninja Patch
Re-implemented some things that were removed a while back by somone who
had NO idea which way to hold a keyboard. (He made Phase Shift costless
by mistake, broke Adrenaline, made EStars cost your entire battery,
etc...). Fixed Ninja objective generation (It should actually happen
now!). As well as removed my implementation of the Kamikaze mode, as I
found there was a better one already implemented. Lastly I fixed the
NinjaHud so Vampires and their Thralls now show up properly on his HUD.
Totally worth my Christmas Eve.
2013-12-25 02:29:00 -05:00
ZomgPonies d4055a89af Buckshot whee! 2013-12-12 22:10:33 -05:00
Regen1 5224244268 Added Syndicate strike team to secrets panel
Also removed the Dsay "BADMIN" and changed it to just "ADMIN"
2013-12-03 21:43:10 +01:00
ZomgPonies f60b0e610b AntagHUD for admins and ghosts (who cannot respawn) 2013-11-30 06:39:04 -05:00
ZomgPonies b982bba1e6 Moar debug tools for ponies 2013-11-29 11:39:05 -05:00
ZomgPonies 86ce80d9e1 New respawn system is in yay! 2013-11-28 16:44:48 -05:00
ZomgPonies d7e91ed2ee Sec levels + dodgeball work 2013-11-26 07:35:50 -05:00
ZomgPonies 33880575fe Fix fix fix 2013-11-25 14:02:37 -05:00
ZomgPonies 533ac36a7b There can be only one 2013-11-25 14:02:36 -05:00
ZomgPonies 928f54c93d More dawdgebawl wip 2013-11-25 10:34:13 -05:00
ZomgPonies de20a3b941 Dodgeball - WIP 2013-11-25 01:10:47 -05:00
ZomgPonies f07b6616d3 Added a HONK rifle to the HONKsquad, shoots snap-pops 2013-11-16 02:27:20 -05:00
ZomgPonies bd48e4c80b Added Chinese Restaurant and barber shop updates, plus some bugfixes 2013-11-02 18:23:07 -04:00
ZomgPonies 00b101d7f2 Seperated ID and PDA slots 2013-11-01 13:28:58 -04:00
ZomgPonies 7048545d6d Projectile code overhaul 2013-10-30 10:32:21 -04:00
SamCroswell 2ca928274f Space Ninja Update
Updating to allow kamikaze mode with Space Ninjas
2013-10-25 19:56:58 -04:00
ZomgPonies 9235bbd222 Vox Fixes 2013-10-20 00:41:03 -04:00
ZomgPonies 5daf979b72 Pretty much all new click code 2013-10-12 14:44:36 -04:00
ZomgPonies aa79d1323b Added Vox and Kidan as unlockable Karma species 2013-10-04 02:57:42 -04:00
ZomgPonies e2826f3675 New Vox gamemode -- Trade 2013-09-28 20:42:32 -04:00
ZomgPonies 2ffdf37166 Overhaul of random events 2013-09-25 23:22:32 -04:00