Commit Graph

12039 Commits

Author SHA1 Message Date
Rob Nelson 688ed60a44 DNA Modifier works perfectly. Code cleanup.
Conflicts:
	code/game/dna/dna_modifier.dm
2014-01-20 01:02:16 -05:00
Rob Nelson 3c5dd233a6 Clean up code, fix appearance randomization. 2014-01-20 01:00:10 -05:00
Rob Nelson 04ab4903c6 Add DNA2 difficulties.
Conflicts:
	code/game/dna/dna2.dm
	code/game/gamemodes/setupgame.dm
2014-01-20 00:59:53 -05:00
Rob Nelson 268836dd33 DNA modifier running again: Fix shitty defer logic, comment out debugging.
Conflicts:
	code/game/dna/dna2.dm
2014-01-20 00:58:24 -05:00
Rob Nelson 7573985069 Additional debugging. Switching to Bleeding to make a fix. 2014-01-20 00:55:26 -05:00
Rob Nelson 775691e244 Debugging. 2014-01-20 00:55:13 -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
Rob Nelson 4a8ca0a7d4 Now tested up to character join. 2014-01-20 00:44:10 -05:00
Rob Nelson db21525feb SAY HELO TO DNA2, N3X15'S AWFUL FUCKING RECODE OF DNA
Conflicts:
	baystation12.dme
	code/game/gamemodes/setupgame.dm
	code/game/objects/items/weapons/dna_injector.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_defines.dm
	code/modules/mob/new_player/new_player.dm
2014-01-20 00:43:19 -05:00
Loganbacca f3354cf5de Fixed rad collector toxin drain bug
Removed bad code modifying variables directly and replaced it with a proc that correctly modifies the gas volume.
2014-01-20 00:20:44 -05:00
ZomgPonies ad46e68054 SMES fix (bis) 2014-01-20 00:20:18 -05:00
d3athrow 266c80a764 sanity checking to resolve runtimes 2014-01-19 23:59:26 -05:00
Cheridan 7e05047ab5 Husking someone as a changeling will now display the victim's notes.
Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm
2014-01-19 21:38:22 -05:00
ZomgPonies e0dff91cb5 SMES fix? 2014-01-19 21:27:43 -05:00
Pete Goodfellow 331cf1df95 Updated all suicide_act()s to use a new span class, 'suicide'.
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/game/objects/items/weapons/melee/misc.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/weaponry.dm
	code/modules/hydroponics/growninedible.dm
	code/modules/hydroponics/hydroitemdefines.dm
	code/modules/surgery/tools.dm
	code/stylesheet.dm
2014-01-19 21:25:47 -05:00
ZomgPonies 0ec4a502fe Updated Chemistry Colors 2014-01-19 21:16:18 -05:00
ZomgPonies 37cf92c4f8 Powers fix right file 2014-01-19 21:14:06 -05:00
Razharas caf4c3d026 Fixes metr-err- i mean slimes
Fixes #225
2014-01-19 21:12:45 -05:00
ZomgPonies 11f32fba24 Nerfed amount of spiders 2014-01-19 21:01:07 -05:00
ZomgPonies bc9f8f6691 Moar Xeno bugfixes 2014-01-19 19:16:52 -05:00
ZomgPonies 258784dea7 Cccomp is Sssilly 2014-01-19 17:32:04 -05:00
ZomgPonies a81c243986 Some more alien fixes 2014-01-19 17:15:04 -05:00
ZomgPonies 65d023dd93 Facehugger to Full alien, all player controlled 2014-01-19 16:45:20 -05:00
ZomgPonies f0438a52b8 Changed how embryos turn into larvae 2014-01-19 12:42:53 -05:00
ZomgPonies 86e3c1d25f Alien auto ranged attacks + intent fixes 2014-01-19 11:16:47 -05:00
ZomgPonies 90496be20a Standardized intent names so it's all harm. Fuck you hurt. 2014-01-19 08:30:50 -05:00
ZomgPonies 09e74e4406 AI SMES fix 2014-01-19 07:16:56 -05:00
ZomgPonies a40ee3b8ec Revert "Rework of colour mixing"
This reverts commit 1f0e1f6209.
2014-01-19 05:36:54 -05:00
Glloyd 085de1b71c Resolves #2213 Fixes the back icons for the scythe and the Roman shield.
Conflicts:
	icons/mob/back.dmi
2014-01-19 05:32:34 -05:00
RKF45 1f0e1f6209 Rework of colour mixing
Conflicts:
	code/modules/reagents/Chemistry-Colours.dm
2014-01-19 05:29:40 -05:00
Rob Nelson cd2c20a6fe NEW BOO SYSTEM!
Conflicts:
	code/datums/spell.dm
	code/modules/mob/dead/observer/observer.dm
2014-01-19 05:22:20 -05:00
ZomgPonies bd19698615 Merge pull request #119 from SamCroswell/master
CentComm changes
2014-01-18 12:29:19 -08:00
ZomgPonies 1883939d18 Merge pull request #120 from alex-gh/sparkles-icon
Firesuits no longer protect against pressure damage.
2014-01-18 12:29:07 -08:00
alex-gh f807c1c938 Added 'Sparkles' to the AI selection 2014-01-18 08:08:38 +01:00
SamCroswell d498adb324 Ninja / CentComm changes 2014-01-18 00:34:24 -05:00
d3athrow bcd6a3c420 Maybe fix #288 2014-01-17 13:10:18 -05:00
Rob Nelson b5a1eff678 Add ghost radio
Conflicts:
	code/modules/client/preferences.dm
	code/world.dm
2014-01-17 13:10:00 -05:00
Rob Nelson 985f164541 Add "Die a glorious death" objective. 2014-01-17 13:03:30 -05:00
Ccomp5950 b15fb8a04b Supermatter update.
Now gives an instability% warning in it's messages.

Limited the "If they can see it and aren't wearing mesons, have some hallucinations" range to a max of 7

Can't be pelted with lasers while out in space allowing for unlimited power only to drag it back on a turf and instantly explode.

Removed extra if(!removed) check, we already checked for that above.

Moved the oxygen ratio variable "oxygen" to be declared under the object instead of it's process proc for easier debugging.

Changed the alert interval.

Add luminosity value so the big glowing shard of supermatter actually generates light.

Conflicts:
	code/modules/supermatter/supermatter.dm
2014-01-17 09:06:00 -05:00
Ccomp5950 7541463e01 Moved Supermatter.dm out of the WorkInProgress directory.
Conflicts:
	baystation12.dme
2014-01-17 09:01:09 -05:00
Furlucis d7bb62fc90 Tweaks homunculi
Makes them a bit creepier, and makes it so they don't spawn with
underwear. Because really, if the rune spawns anything, it should be
robes. But that would make things too easy.
2014-01-17 08:57:41 -05:00
Furlucis 208f5fd592 Removes the second holywater
Deletes the second kind of holy water that doesn't do anything. Lemme
know if I should do the opposite of this.

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
2014-01-17 08:57:11 -05:00
Aranclanos eb76256f04 Adds the captain's medal to the medal's lockbox.
Fixes issue 2358

Conflicts:
	code/game/objects/items/weapons/storage/lockbox.dm
2014-01-16 21:55:00 -05:00
alex-gh a1c600d9b8 Made DS suits spaceproof 2014-01-16 20:42:09 +01:00
alex-gh e9d2314386 Firesuits no longer protect against pressure 2014-01-16 20:28:40 +01:00
alex-gh f390a11d07 Runtime fix 2014-01-16 17:14:57 +01:00
alex-gh fd9c78dd85 Assembly holders get destroyed by explosions. 2014-01-16 17:10:41 +01:00
ZomgPonies 1b4a48a8f7 Fueltank bombs no worky 2014-01-16 09:28:08 -05:00
ZomgPonies 48403dcc8e A lot of fixing up job preferences. 2014-01-16 09:18:49 -05:00
ZomgPonies 2525a3d057 Added barber karma job 2014-01-16 08:42:36 -05:00