cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-27 18:51:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,483 Commits 26 Branches 2 Tags
f44ff1d7aa2b34638ca0f8a7cd0df4bd0ee8f33e
Commit Graph

6670 Commits

Author SHA1 Message Date
Rob Nelson
f44ff1d7aa Standardize FAT 
Conflicts:
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/simple_animal/constructs.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_grab.dm
 2014-01-21 22:57:10 -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
22a2df1115 Standardize HULK. 
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/items/weapons/swords_axes_etc.dm
 2014-01-21 22:45:40 -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
DJSnapshot
0f5f78fcc9 fix for muting deadme as well. 2014-01-21 21:48:05 -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
ZomgPonies
cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -05:00
ZomgPonies
9fb2bcd473 Merge pull request #122 from Regen1/master 
Added new Fluff sprite from Wisewill
 2014-01-21 13:24:16 -08:00
Regen
6927592524 Fix 2014-01-21 22:19:29 +01:00
Regen
0e6b3fb165 Added new Fluff sprite 
Black schoolgirl uniform, made my Wisewill~
 2014-01-21 22:14:25 +01:00
Rob Nelson
460621bf97 Sober gene implementation 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2014-01-21 14:39:32 -05:00
Rob Nelson
32c6268b59 Implement psy-resist block (and fix some naughty remoteview behavior). 2014-01-21 14:36:12 -05:00
Rob Nelson
57dc0ddd50 Implement toxic farts. 
Conflicts:
	code/game/objects/effects/effect_system.dm
	code/modules/mob/living/carbon/human/human_defines.dm
 2014-01-21 14:35:15 -05:00
Rob Nelson
6091d16262 DNA panel fixed, update changelog. 
Conflicts:
	html/changelog.html
 2014-01-20 11:43:07 -05:00
Rob Nelson
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
Rob Nelson
da78332256 Fix monkey genes. 
Conflicts:
	code/modules/mob/living/carbon/monkey/monkey.dm
	html/changelog.html
 2014-01-20 05:06:19 -05:00
ZomgPonies
4261fa0ae4 Missed a spot 2014-01-20 04:11:31 -05:00
ZomgPonies
c033a83316 Fixing my DNA2 fuckups 2014-01-20 03:43:06 -05:00
ZomgPonies
fe0a3a2dcd Fixing Genetics 2014-01-20 03:31:25 -05:00
Rob Nelson
1c8c96a9eb Fix hallucination gene. 2014-01-20 03:29:09 -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
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
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
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
Rob Nelson
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
Rob Nelson
b15d0213ac Finish rewrite of domutcheck. Time to test this bitch. 
Conflicts:
	code/game/gamemodes/setupgame.dm
 2014-01-20 01:35:56 -05:00
Rob Nelson
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
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
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
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
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
RKF45
1f0e1f6209 Rework of colour mixing 
Conflicts:
	code/modules/reagents/Chemistry-Colours.dm
 2014-01-19 05:29:40 -05:00