cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-18 01:26:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,533 Commits 17 Branches 2 Tags
e3a2a9238da3ef76dd9dc6bd11fda75dcd4eff45
Commit Graph
6566 Commits
Author SHA1 Message Date
Rob NelsonandZomgPonies e3a2a9238d Fix typo before someone notices. 2014-01-24 12:24:14 -05:00
ZomgPonies 47e8c640a2 New display case code 2014-01-24 12:23:26 -05:00
Rob NelsonandZomgPonies 22dcaec46f Fix lithp 2014-01-24 12:17:40 -05:00
Rob NelsonandZomgPonies 1f30243a08 Refactor the fuck out of theft objectives. No more stealing your own jumpsuit. 
Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/objective.dm
	code/modules/mining/money_bag.dm
	code/modules/mining/ores_coins.dm
	html/changelog.html
 2014-01-24 12:16:57 -05:00
d3athrowandZomgPonies e937bdd4c2 Should in fact, really fix the monkey dna 2014-01-24 12:05:54 -05:00
Rob NelsonandZomgPonies 341d210c99 Fix some issues with the radio, like talking on common when calling for command. 2014-01-24 12:04:52 -05:00
VincentandZomgPonies 7b58cc04b2 Gives mobs a "fall" proc for the transition between falling and standing. This is not for the rotation code, which occurs on both falling and rising. 
Adds a variable to hats to determine how likely they are to fall off.  Makes them fall off with the given probability when disarmed (some percentage of the time) or when the character falls.  Space helmets, bio hoods, helmets, radiation helmets, etc, are unlikely to fall off

Conflicts:
	code/game/gamemodes/cult/cult_items.dm
	code/modules/clothing/clothing.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/head/helmet.dm
	code/modules/clothing/head/jobs.dm
	code/modules/clothing/head/misc.dm
	code/modules/clothing/head/misc_special.dm
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/tgevents/holiday/xmas.dm
	code/modules/mob/mob.dm
 2014-01-24 00:16:46 -05:00
TenebrosityandZomgPonies f6603faa52 Adds sounds to falling over 
Resting and buckling are still silent.

Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
 2014-01-24 00:01:15 -05:00
Rob NelsonandZomgPonies d01ef41eac Radio code in say.dm cleaned up, will use all possible radios when sending a message. 
Conflicts:
	code/modules/mob/living/say.dm
 2014-01-23 23:48:46 -05:00
Rob NelsonandZomgPonies ba5a389df6 Fix horns, add horn sprite. 
Conflicts:
	icons/effects/genetics.dmi
 2014-01-23 23:44:08 -05:00
Rob NelsonandZomgPonies bd25990ce2 Fix MONKEYBLOCK 2014-01-23 23:42:23 -05:00
ZomgPonies f1c80be06f Merge pull request #127 from SamCroswell/master 
Tweaks 'n shit
 2014-01-23 20:34:50 -08:00
ErgovisaviandZomgPonies 7ad68dd693 Replaced wall_smash in simple_animal with environment_smash, because before, you either tables AND walls, or nothing. If set to 1, smash crate/locker/rack/table, 2 for wallsmash, 3 for rwall smash 
Hostile mobs with environment smash will also unbuckle themselves by destroying whatever they're buckled to when angered.

Conflicts:
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/game/objects/structures/tables_racks.dm
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/simple_animal/hostile/hostile.dm
 2014-01-23 23:31:36 -05:00
SamCroswell d4890fb2f5 Additional Drug Names 2014-01-23 19:26:32 -05:00
SamCroswell f59fa5474e Contraband Crate Changes, Minor Drug Tweaks 
More little tweaks to the random drugs, added actual contraband to the
contraband crate. Maybe people will have a reason to buy it now, eh?
 2014-01-23 18:01:41 -05:00
Cluwnes HonkandZomgPonies 6478e2e1d7 silent is broken as fuck 
Removes the message that checks if a mob is silent; silent is just plain broken.
 2014-01-23 10:34:41 -05:00
Cluwnes HonkandZomgPonies f54a35db72 Prevents mimes from using the megaphone. 
if(user.silent) didn't work. This is the next best thing.
 2014-01-23 10:34:03 -05:00
SamCroswell a3a883444c Last minute tweaks 2014-01-22 23:12:50 -05:00
ZomgPonies 372b00f58c Merge pull request #126 from SamCroswell/master 
Random Drug Pills / CentComm tweaks
 2014-01-22 20:12:20 -08:00
SamCroswell fc4877b301 Added a few more drug names 2014-01-22 22:55:19 -05:00
SamCroswell 86ad8a5a17 Drugs/Minor CentComm Updates 2014-01-22 22:26:01 -05:00
ErgovisaviandZomgPonies 7bd3df0b3b More hostile mob work with behavior vars, getting rid of idle_env_destroyer nobody uses it, other tweaks 
Conflicts:
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
 2014-01-22 16:45:20 -05:00
ErgovisaviandZomgPonies 78bea65a44 Mining Mobs - More mob behavior overhaul, kinetic gun tweaks, etc 
Conflicts:
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/projectiles/ammunition/energy.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/projectile.dm
	code/modules/projectiles/projectile/special.dm
	icons/mob/animal.dmi
	icons/obj/projectiles.dmi
 2014-01-22 16:39:54 -05:00
errorageandZomgPonies 983b151e6b - Hacking borgs via robotics console will now also properly update their HUD with their hidden inventory. 
Conflicts:
	code/game/machinery/computer/robot.dm
 2014-01-22 11:14:30 -05:00
John SmithandZomgPonies 7a10f3c626 Black Baseball Caps [FIXED] 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
 2014-01-22 11:07:39 -05:00
Jesus Hussein ChrisandZomgPonies 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 NelsonandZomgPonies dcaf8d4e49 Add check_mutations to detective and bartender, just in case 2014-01-21 23:01:59 -05:00
Rob NelsonandZomgPonies 1a94d400f7 Add SOBER mutation to detective and bartender. 
Conflicts:
	code/game/jobs/job/security.dm
 2014-01-21 23:01:45 -05:00
Rob NelsonandZomgPonies 02d01626fb Fix M_FAT'd strings. 2014-01-21 23:00:16 -05:00
Rob NelsonandZomgPonies 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 NelsonandZomgPonies 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 NelsonandZomgPonies 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 NelsonandZomgPonies 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 NelsonandZomgPonies 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 NelsonandZomgPonies 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
ZomgPonies cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -05:00
RazharasandZomgPonies 8f71ea55e3 Added tools and time handling 
Well yeah
 2014-01-21 21:05:50 -05:00
RazharasandZomgPonies 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
Rob NelsonandZomgPonies 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 NelsonandZomgPonies 6091d16262 DNA panel fixed, update changelog. 
Conflicts:
	html/changelog.html
 2014-01-20 11:43:07 -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 NelsonandZomgPonies 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 NelsonandZomgPonies fbabcb9117 Add missing files. 2014-01-20 02:04:15 -05:00
Rob NelsonandZomgPonies 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 NelsonandZomgPonies d31bc9def9 UI fix from Ccomp5950 2014-01-20 01:59:51 -05:00