Commit Graph

1178 Commits

Author SHA1 Message Date
d3athrow
bd0354cf7d Fix not being able to open the playerpanel of aliens due to a runtime. 2014-04-23 11:45:07 -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
Rob Nelson
8bd9502981 GC fixes, debug verb for toggling. 2014-03-03 19:11:20 -05: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
Jordie0608
0be041991b totally didn't forget about this, no siree
Conflicts:
	code/modules/admin/admin_verbs.dm
2014-01-31 02:44:25 -05:00
Jordie0608
76cf20b458 Commented out toggle admin-jump button 2014-01-31 02:43:00 -05: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
DJSnapshot
73e66bde07 Admin requested addition of a global dsay toggle.
Conflicts:
	code/modules/admin/admin_verbs.dm
2014-01-21 21:47:38 -05:00
Rob Nelson
6091d16262 DNA panel fixed, update changelog.
Conflicts:
	html/changelog.html
2014-01-20 11:43:07 -05:00
Rob Nelson
ace34c60b0 DNA2: New powers from Paradise's release of Goon's genetic code. Also added lisp disability.
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	html/changelog.html
2014-01-20 02:10:58 -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
ZomgPonies
6dbf776ff4 Gamme to shuttle, part two 2014-01-16 06:57:17 -05:00
ZomgPonies
391cad7d5f Trying to add xenor to traitor panels 2014-01-15 11:56:59 -05:00
ZomgPonies
1bbc25d52e Fixes 2014-01-10 23:45:20 -05:00
SkyMarshal
a97f985200 Adds developer-level access to ZAS settings.
Fixes bug which would always let heat move through doors.

Conflicts:
	code/modules/admin/admin_verbs.dm
2014-01-10 23:41:43 -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
62b0b49659 Brain Borer Overhaul 2013-12-19 03:32:19 -05:00
ZomgPonies
ecaaec5257 Magic Overhaul Part Deux 2013-12-18 02:30:55 -05:00
ZomgPonies
46e05cf2e4 Vamp menu fixes 2013-12-14 19:29:35 -05:00
ZomgPonies
d4055a89af Buckshot whee! 2013-12-12 22:10:33 -05:00
Regen1
842407771e Fixed typo 2013-12-04 15:39:41 +01: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
alex-gh
9ebee104db Replaced some of the legacy events in the admin menu with a non-legacy events 2013-12-02 15:42:50 +01:00
ZomgPonies
f60b0e610b AntagHUD for admins and ghosts (who cannot respawn) 2013-11-30 06:39:04 -05:00
ZomgPonies
506c3f8c00 Added nymphs and ERT to jobban list 2013-11-30 05:57:50 -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