cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 05:32:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,483 Commits 26 Branches 2 Tags
f44ff1d7aa2b34638ca0f8a7cd0df4bd0ee8f33e
Commit Graph

3510 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
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
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
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
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
Razharas
caf4c3d026 Fixes metr-err- i mean slimes 
Fixes #225
 2014-01-19 21:12:45 -05:00
ZomgPonies
bc9f8f6691 Moar Xeno bugfixes 2014-01-19 19:16:52 -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
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
alex-gh
f807c1c938 Added 'Sparkles' to the AI selection 2014-01-18 08:08:38 +01:00
ZomgPonies
2f2e6c611f Re-added? Stop drop and roll 2014-01-16 03:47:26 -05:00
ZomgPonies
d40ebc5cc5 Revert "Tradeband and Gutterspeak now have a different font than Tradeband." 
This reverts commit b5906bba39.

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
 2014-01-15 06:54:46 -05:00
Incoming
048ed6e9fd [tumblr approved] Sausage Party Reduction 
*Lets adamantine golems and ninjas generate female where before they were generated exclusively male.

The ninja spacesuit has a coded in female variant that has existed forever but was not actually used. It only shows up upon suit ACTIVATION because (?:?:?)|\|i|\|j4c0d3(?:?:?).

Likewise female adamantine golems have their own sprites and can show up in staff of change shots, but ones generated from the rune were always male.

This does NOT effect admin summoned unknown humans, those are all still male.

Conflicts:
	code/modules/events/tgevents/ninja.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
 2014-01-14 22:55:39 -05:00
d3athrow
f16a6a83db clean up the code 
Conflicts:
	code/modules/mob/mob.dm
 2014-01-14 04:30:13 -05:00
d3athrow
bf275e1964 Should fully resolve issue #344 
Conflicts:
	code/modules/mob/mob.dm
 2014-01-14 04:25:24 -05:00
ZomgPonies
1dc7b05b76 Gibsound changes 2014-01-14 04:17:42 -05:00
Hornygranny
95835ac98c Changed neurotoxin from a child of energy to a child of bullet 
Conflicts:
	code/modules/projectiles/projectile/bullets.dm
 2014-01-13 04:36:15 -05:00
Hornygranny
550d9b2e76 Extra indents removed 2014-01-13 04:27:44 -05:00
Hornygranny
5a443e5010 Replaced spaces with tabs. 2014-01-13 04:27:18 -05:00
Hornygranny
6eefff2c68 Code by Giacom. Changes alien neurotoxin spit to dumbfire. 
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
 2014-01-13 04:27:08 -05:00
ZomgPonies
d24cdd2f10 Added a gib sound effect 2014-01-13 02:11:15 -05:00
ZomgPonies
33d1461293 Showing brain part deux 2014-01-12 23:14:35 -05:00
Rob Nelson
55e918cc6a Wire hacking recode from /tg/. 
Conflicts:
	baystation12.dme
	code/__HELPERS/mobs.dm
	code/defines/obj/weapon.dm
	code/game/machinery/alarm.dm
	code/game/machinery/doors/airlock.dm
	code/game/machinery/machinery.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/paicard.dm
	code/game/objects/items/weapons/explosives.dm
	code/global.dm
	code/modules/assembly/signaler.dm
	code/modules/mob/living/silicon/mommi/life.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/wires.dm
 2014-01-12 22:37:55 -05:00
ZomgPonies
719c254817 Showing brain first pass 2014-01-12 08:42:03 -05:00
ZomgPonies
cf79a5f972 Fix puking over skeletons 2014-01-12 00:16:40 -05:00