044d6a79cb
Fix monkey UI appends not being completed for DNA2.
...
Conflicts:
code/modules/mob/living/carbon/monkey/monkey.dm
2014-01-20 05:14:38 -05:00
da78332256
Fix monkey genes.
...
Conflicts:
code/modules/mob/living/carbon/monkey/monkey.dm
html/changelog.html
2014-01-20 05:06:19 -05:00
4261fa0ae4
Missed a spot
2014-01-20 04:11:31 -05:00
c033a83316
Fixing my DNA2 fuckups
2014-01-20 03:43:06 -05:00
fe0a3a2dcd
Fixing Genetics
2014-01-20 03:31:25 -05:00
1c8c96a9eb
Fix hallucination gene.
2014-01-20 03:29:09 -05:00
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
520a2cd401
NanoUI changes from Faerdan
...
Conflicts:
code/game/dna/dna_modifier.dm
code/game/machinery/cryo.dm
code/modules/nano/nanomanager.dm
code/modules/nano/nanoui.dm
code/modules/reagents/Chemistry-Machinery.dm
2014-01-20 02:02:31 -05:00
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
6fe47cfc51
Standardize buffers on all DNA machines in an attempt to fix DNA modifiers. WILL BREAK SHIT
...
Conflicts:
code/game/machinery/computer/cloning.dm
code/game/objects/items/weapons/dna_injector.dm
2014-01-20 01:48:57 -05:00
fd6cc3e458
HA HA NEW GENE HANDLING
...
Also fixed block injector crash.
Conflicts:
code/game/dna.dm
code/modules/mob/living/carbon/monkey/monkey.dm
html/changelog.html
2014-01-20 01:41:03 -05:00
b15d0213ac
Finish rewrite of domutcheck. Time to test this bitch.
...
Conflicts:
code/game/gamemodes/setupgame.dm
2014-01-20 01:35:56 -05:00
450a5dec8e
Start wrapping up the new domutcheck logic
...
Conflicts:
code/game/dna/dna2_helpers.dm
code/modules/mob/mob_defines.dm
2014-01-20 01:15:15 -05:00
1b2d09bb2d
More fixings.
...
Conflicts:
code/game/machinery/computer/medical.dm
2014-01-20 01:09:03 -05:00
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
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
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
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
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
ad46e68054
SMES fix (bis)
2014-01-20 00:20:18 -05:00
e0dff91cb5
SMES fix?
2014-01-19 21:27:43 -05:00
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
0ec4a502fe
Updated Chemistry Colors
2014-01-19 21:16:18 -05:00
caf4c3d026
Fixes metr-err- i mean slimes
...
Fixes #225
2014-01-19 21:12:45 -05:00
11f32fba24
Nerfed amount of spiders
2014-01-19 21:01:07 -05:00
bc9f8f6691
Moar Xeno bugfixes
2014-01-19 19:16:52 -05:00
258784dea7
Cccomp is Sssilly
2014-01-19 17:32:04 -05:00
a81c243986
Some more alien fixes
2014-01-19 17:15:04 -05:00
65d023dd93
Facehugger to Full alien, all player controlled
2014-01-19 16:45:20 -05:00
f0438a52b8
Changed how embryos turn into larvae
2014-01-19 12:42:53 -05:00
86e3c1d25f
Alien auto ranged attacks + intent fixes
2014-01-19 11:16:47 -05:00
90496be20a
Standardized intent names so it's all harm. Fuck you hurt.
2014-01-19 08:30:50 -05:00
09e74e4406
AI SMES fix
2014-01-19 07:16:56 -05:00
a40ee3b8ec
Revert "Rework of colour mixing"
...
This reverts commit 1f0e1f6209
2014-01-19 05:36:54 -05:00
1f0e1f6209
Rework of colour mixing
...
Conflicts:
code/modules/reagents/Chemistry-Colours.dm
2014-01-19 05:29:40 -05:00
cd2c20a6fe
NEW BOO SYSTEM!
...
Conflicts:
code/datums/spell.dm
code/modules/mob/dead/observer/observer.dm
2014-01-19 05:22:20 -05:00
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
f807c1c938
Added 'Sparkles' to the AI selection
2014-01-18 08:08:38 +01:00
b5a1eff678
Add ghost radio
...
Conflicts:
code/modules/client/preferences.dm
code/world.dm
2014-01-17 13:10:00 -05:00
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
7541463e01
Moved Supermatter.dm out of the WorkInProgress directory.
...
Conflicts:
baystation12.dme
2014-01-17 09:01:09 -05:00
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
a1c600d9b8
Made DS suits spaceproof
2014-01-16 20:42:09 +01:00
e9d2314386
Firesuits no longer protect against pressure
2014-01-16 20:28:40 +01:00
fd9c78dd85
Assembly holders get destroyed by explosions.
2014-01-16 17:10:41 +01:00
48403dcc8e
A lot of fixing up job preferences.
2014-01-16 09:18:49 -05:00
2525a3d057
Added barber karma job
2014-01-16 08:42:36 -05:00
6dbf776ff4
Gamme to shuttle, part two
2014-01-16 06:57:17 -05:00
2f2e6c611f
Re-added? Stop drop and roll
2014-01-16 03:47:26 -05:00
c8ceab5aa2
Adds Randomized Character Slot, if enabled picks a random populated character slot to use upon round start. Does not affect late joins for now.
...
Conflicts:
code/modules/client/preferences.dm
code/modules/client/preferences_savefile.dm
html/changelog.html
2014-01-16 00:48:24 -05:00
Rob Nelson