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
63,724 Commits 17 Branches 2 Tags
dependabot/github_actions/actions/setup-python-7.0.0
Commit Graph
2934 Commits
Author SHA1 Message Date
ErgovisaviandZomgPonies 311528762c Walking mushrooms will inherit some of the original properties of the food item that they were spawned from. 
Walking shrooms with ckeys will not gain levels, unlike wild ones, to keep things from getting silly.
 2014-02-01 05:30:44 -05:00
ErgovisaviandZomgPonies f85ac1af63 Walking mushrooms will now hunt and eat eachother, growing stronger when they do! The stronger they get, the better the quality of the mushroom slices you can butcher out of them! Don't smack em yourself though, or you'll bruise them, and they won't get stronger from being eaten. 
Conflicts:
	baystation12.dme
	code/modules/mob/living/simple_animal/friendly/mushroom.dm
 2014-02-01 05:27:59 -05:00
Rob NelsonandZomgPonies c3b021e246 Added a garbage collector implementation based on rumors from Goon and proc references in released gooncode. 
And holy shit it's fast

Conflicts:
	baystation12.dme
	code/ATMOSPHERICS/pipes.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/rechargestation.dm
	code/game/objects/structures/crates_lockers/crates.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mining/mine_turfs.dm
	code/modules/paperwork/photocopier.dm
	code/modules/power/cable.dm
	html/changelog.html
 2014-01-29 23:45:21 -05:00
Fox-McCloud 57f113b427 Chemistry and Brain Damage 2014-01-29 00:58:58 -05:00
Rob NelsonandZomgPonies 22f6bb90be Add additional extinguisher logging, transfer logging framework. 
Conflicts:
	code/game/objects/items/weapons/extinguisher.dm
 2014-01-25 12:29:21 -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
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 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
Rob NelsonandZomgPonies 460621bf97 Sober gene implementation 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
 2014-01-21 14:39:32 -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 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
ZomgPonies 0ec4a502fe Updated Chemistry Colors 2014-01-19 21:16:18 -05:00
ZomgPonies 90496be20a Standardized intent names so it's all harm. Fuck you hurt. 2014-01-19 08:30:50 -05:00
ZomgPonies a40ee3b8ec Revert "Rework of colour mixing" 
This reverts commit 1f0e1f6209.
 2014-01-19 05:36:54 -05:00
RKF45andZomgPonies 1f0e1f6209 Rework of colour mixing 
Conflicts:
	code/modules/reagents/Chemistry-Colours.dm
 2014-01-19 05:29:40 -05:00
Ccomp5950andZomgPonies 7541463e01 Moved Supermatter.dm out of the WorkInProgress directory. 
Conflicts:
	baystation12.dme
 2014-01-17 09:01:09 -05:00
FurlucisandZomgPonies 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
ZomgPonies a99b45a3bd Able to melt decapitated heads into skulls with acid 2014-01-15 08:10:33 -05:00
ZomgPonies 2a3620b90f Merge pull request #114 from alex-gh/tweaks_and_fixes 
Tweaks and fixes
 2014-01-12 23:55:12 -08:00
alex-gh a8e73dbef7 Nerfed unstable mutagen rads, buffed radium rads 2014-01-13 06:13:31 +01:00
Mark Aherne (Faerdan)andZomgPonies 7fdb4ac503 APC NanoUI 
* Created new APC UI
* Tweaked Chem Master UI width.

Conflicts:
	code/modules/power/apc.dm
	nano/templates/apc.tmpl
 2014-01-12 21:52:06 -05:00
d3athrowandZomgPonies c8bc025cc7 Fix holywater hurting full power vampires 2014-01-11 04:41:32 -05:00
fleureandZomgPonies 27c35cfdac Added spider meat recipes 
Conflicts:
	code/modules/food/recipes_microwave.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	icons/obj/food.dmi
 2014-01-11 00:16:12 -05:00
ZuhayrandZomgPonies 600bfba275 Colour fix for bread slices. 2014-01-11 00:02:07 -05:00
ZuhayrandZomgPonies 2f0cb6635b Icon fixes, shards hidden in food will now lacerate random body parts because damage code is weird. Stop eating chocolate cake sandwich with your left food. 2014-01-11 00:01:34 -05:00
ZuhayrandZomgPonies 2cd1580acd Added filling_color var to food items for use in sandwiches. 
Conflicts:
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
 2014-01-10 23:56:24 -05:00
SkyMarshalandZomgPonies e2bbbb7e39 Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed. 
Conflicts:
	code/modules/mining/mine_turfs.dm
 2014-01-09 20:56:38 -05:00
ZuhayrandZomgPonies 3789e82f7b Roasted diona, for ZomgPonies/Paradise. 
Conflicts:
	code/modules/reagents/reagent_containers/food/snacks.dm
	icons/obj/food.dmi
 2014-01-09 09:14:20 -05:00
alex-gh 404ee2ac1f typo fix 2014-01-09 06:02:45 +01:00
alex-gh d239894e9b Removed water recipe, reagent fixes 2014-01-09 03:00:05 +01:00
ZuhayrandZomgPonies f66b5a3ccc Removed a return. 2014-01-06 23:47:46 -05:00
ZuhayrandZomgPonies e0d803d158 Made syringes take from the reagents datum of a NO_BLOOD mob rater than vessel. 2014-01-06 23:47:21 -05:00
ZuhayrandZomgPonies a8c8bb7fa6 Added NO_BLOOD checks to drips, syringes. 
Conflicts:
	code/modules/organs/blood.dm
 2014-01-06 23:46:58 -05:00
Mark Aherne (Faerdan)andZomgPonies 5d04a41151 NanoUI updates. 
* Simplified the code used in ui_interact procs and updated all current uses.
* Removed ununused jsviews JavaScript code (replaced it with vanilla jsrender).
* Added a message to the UI which shows if JavaScript is disabled (people with JavaScript disabled previously got blank UIs).

Conflicts:
	code/game/objects/items/devices/PDA/PDA.dm
	code/game/objects/items/devices/uplinks.dm
	code/modules/reagents/Chemistry-Machinery.dm
	nano/css/shared.css
 2014-01-05 23:28:52 -05:00
Rob NelsonandZomgPonies 74e6b51b88 Silver slimes now produce drinks upon injection with water. (#345) 2014-01-05 00:50:20 -05:00
ZomgPonies 227fbc8cbe Changed green slime extract effect 2014-01-04 22:22:12 -05:00
ZomgPonies 1458a5834f Missed a spot 2014-01-04 18:46:23 -05:00
NanaiandZomgPonies bf9ba0f658 Added and Adjusted Chemicals 
Fixes with the changes of eyes to internal organs with Imidazoline and the surgery.

New chemicals:
Peridaxon, Potassium Chloride, and Potassium Chlorophoride. Peridaxon: Internal organ healing chemical; 2Bicard+2Clonex(plasma catalyst). Potassium Chloride: Stops hearts for medical in overdose; Salt+Potassium, Potassium Chlorophoride: Stops hearts right proper; PotassiumChloride+Plasma+Chloral Hydrate.

Chloral Hydrate and Soporific changes
Made chloral hydrate less instakill(nerfed), but a toxic dropper without blackscreen. Soporific buffed, but less blackscreen sleeping applied.

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
	code/setup.dm
 2014-01-04 15:59:22 -05:00
ZomgPonies 6827a12afe Fire extinguishers can now spray any reagent desired. 2014-01-03 21:22:53 -05:00
ZomgPonies 2c0315a56c Small holy water vamp fix 2014-01-03 20:58:09 -05:00
ZomgPonies 7bbf936f45 Added space cleaner refiller 2014-01-03 14:09:30 -05:00
ZomgPonies a0d866b366 Popable cans and beer cans 2013-12-31 21:44:21 -05:00
ZomgPonies 9ad437b8c5 Adding checks for LAssailant everywhere whee 2013-12-23 04:57:44 -05:00
ZomgPonies 21666af24d Organ/Surgery Overhaul Part 2 2013-12-19 08:59:02 -05:00
ZomgPonies 5ce256b73c Organ/Surgery Overhaul Part 1 2013-12-19 07:25:55 -05:00
ZomgPonies e29afdaf2b Dirt overlay fixes 2013-12-17 07:25:42 -05:00
ZomgPonies 912601a30d Vampire Gamemode! 2013-12-13 19:38:49 -05:00