cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-24 00:12:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,605 Commits 29 Branches 2 Tags
fa6655c1908134f792b5890b28dd67d24a9cfad6
Commit Graph

11809 Commits

Author SHA1 Message Date
Tenebrosity
6a1b03aa24 Throw impacts play the thrown object's hitsound 
Conflicts:
	code/modules/mob/living/living_defense.dm
 2014-01-22 10:26:58 -05:00
Tenebrosity
67c88c42e7 Adds generic impact noises to all projectiles 
Overrides the generic sounds with specific ones for electrodes and
lasers.

Conflicts:
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/energy.dm
 2014-01-22 10:20:16 -05:00
Jesus Hussein Chris
95f7280781 Generic attack sounds for all melee weapons 
Overrides the generic sounds with more suitable ones where needed.
Weapons that do no damage don't have sound effects.

Conflicts:
	code/game/gamemodes/wizard/artefact.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/melee/misc.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/weaponry.dm
	code/game/objects/weapons.dm
	code/modules/hydroponics/hydroitemdefines.dm
	code/modules/surgery/tools.dm
 2014-01-22 10:15:43 -05:00
ZomgPonies
35bb181d23 Merge pull request #123 from SamCroswell/master 
Ninja Teleport Quickfix, ERT Armory now has a blast door
 2014-01-21 20:12:10 -08:00
SamCroswell
7facce411c Ninja Quickfix, ERT Armory now has a blast door 2014-01-21 23:04:50 -05:00
Rob Nelson
dcaf8d4e49 Add check_mutations to detective and bartender, just in case 2014-01-21 23:01:59 -05:00
Rob Nelson
1a94d400f7 Add SOBER mutation to detective and bartender. 
Conflicts:
	code/game/jobs/job/security.dm
 2014-01-21 23:01:45 -05:00
Rob Nelson
02d01626fb Fix M_FAT'd strings. 2014-01-21 23:00:16 -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
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
ZomgPonies
5784cf61df Compile fixes XRAY 2014-01-21 22:38:35 -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
Razharas
8f71ea55e3 Added tools and time handling 
Well yeah
 2014-01-21 21:05:50 -05:00
Razharas
56e56b31a6 Implemented crude crafting 
Debug messages are still inside, pushing only cozx pete asked me to

Conflicts:
	code/_globalvars/lists/objects.dm
	code/game/objects/structures/tables_racks.dm
 2014-01-21 21:05:42 -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
bb853093c1 Intercom runtime fix 2014-01-20 04:05:29 -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
fbabcb9117 Add missing files. 2014-01-20 02:04:15 -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
d31bc9def9 UI fix from Ccomp5950 2014-01-20 01:59:51 -05:00
Rob Nelson
ff2d37265c Screw around with gene logic. 
Conflicts:
	code/game/dna/dna2_domutcheck.dm
 2014-01-20 01:59:31 -05:00
d3athrow
b6045a2bbe Fix move_inside verb exploit across the board 
Conflicts:
	code/game/machinery/Sleeper.dm
 2014-01-20 01:58:03 -05:00
Rob Nelson
dc5a4a8a84 Fix beaker being ejected with occupant. 2014-01-20 01:55:12 -05:00
Rob Nelson
fe2f161be2 Fix for issue #309 2014-01-20 01:54:58 -05:00
Rob Nelson
a04324baef Fix more by-ref issues in DNA 
Conflicts:
	code/game/machinery/hydroponics.dm
 2014-01-20 01:54:33 -05:00
Rob Nelson
36b967d962 I am double-stupid. Thanks to Zuhayr and Chinsky for pointing this out. 
Conflicts:
	html/changelog.html
 2014-01-20 01:53:41 -05:00
d3athrow
f81e616f21 lazy setSEstate workaround 2014-01-20 01:53:17 -05:00
d3athrow
211d1bfdbe Fix not being able to change the buffer label 2014-01-20 01:53:06 -05:00
Rob Nelson
9e956b63ee Fix getting "monkey(666)" instead of "Jebediah Jenkins" when dicking with DNA. 2014-01-20 01:52:47 -05:00
Rob Nelson
7456592afa I am fucking stupid. 2014-01-20 01:52:36 -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
c349f761d9 Fixes for DNA2, again, 2014-01-20 01:50:56 -05:00