cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-18 17:46:53 +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
IcyV 51033b9847 Expanded upon overdose system 
Adds brute, burn, and oxy damage as potential overdose effects.
 2014-07-23 12:14:17 -07:00
Ccomp5950andZomgPonies 0beada11c7 Chem Master won't resize it's window by adding a scroll bar on selection. 
Fixes #5574

Conflicts:
	code/modules/reagents/Chemistry-Machinery.dm
 2014-07-23 09:01:57 -04:00
ZomgPonies f491b31d2b PR fixes 2014-07-22 20:05:26 -04:00
ZomgPonies 1812fe529d Merge pull request #315 from IcyV/overdose 
Fixed version of a trial overdose system.
 2014-07-22 19:45:06 -04:00
IcyV 6b4d2f7c82 Fixed version of a trial overdose system. 
Applies basic toxin damage when a volume threshold is met.
 2014-07-22 16:39:16 -07:00
VampyrBytes 4113b531af rewrite for DF/CM and grill 
rewrite cos damn!

No more spam names... worst they can get is one of each type in a name.
CM won't accept anything that's been cerealized (at any point), DF and
grill will accept things that have been in them before, but you'll end
up with a burned mess, a cloud of smoke, and the chance of a small fire
 2014-07-21 20:37:25 +01:00
IcyV 6198d9e9d9 Reverts hyperzine to its previous state, keep its addictivness 
Revert "Made hyperzine same color as salt, because HAHA"

This reverts commit b23b5b62d9.

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

Revert "Made hyperzine harder to make properly."

This reverts commit 489cdf0096.

Removes Benazine

Revert "Nerfs for OD"

This reverts commit 4b94406efb.

Revert "Hyperzine fix"

This reverts commit d6702496f9.

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

Revert "Made Cyanide more deadly, added OD to Hyperzine"

This reverts commit 1cb87e07cf.
 2014-07-21 03:15:14 -07:00
ZomgPonies 64554340f4 Modifed faction system to use a list instead. Mobs can belong to multiple factions at once. 2014-07-19 13:26:55 -04:00
ZomgPonies e2a9e93a59 Revert "Use IconProcs lib ReadRGB instead of another same functionality proc." 
This reverts commit 11f1d82c65.
 2014-07-19 11:43:48 -04:00
ESwordTheCatandZomgPonies 11f1d82c65 Use IconProcs lib ReadRGB instead of another same functionality proc. 
Conflicts:
	code/modules/reagents/Chemistry-Colours.dm
 2014-07-19 11:19:52 -04:00
ZuhayrandZomgPonies bdfc7ef719 Added Crisis and Surgeon modules, removed Medical module, added Construction module, altered Mining and Engineering modules. 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
 2014-07-18 07:30:54 -04:00
VampyrBytes 34712ecc37 Fix for internal organ surgery 
Fixes internal organ surgery, and some other places where the same
problem would have cropped up
 2014-07-16 20:17:50 +01:00
mwerezakandZomgPonies a07b7a5ce3 Thrown items can be targeted, has miss chance... 
...based on distance, similar to projectiles.

Conflicts:
	code/defines/obj.dm
	code/game/machinery/kitchen/smartfridge.dm
	code/game/machinery/vending.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/modules/games/cards.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/living_defense.dm
 2014-07-16 09:53:34 -04:00
ZomgPonies aafa11712a Removal of virus1/disease1 system. So long GBS/Jungle Fever, you'll be missed! 2014-07-16 00:53:08 -04:00
Mark AherneandZomgPonies 9b45dbabfb Continued work in progress on a major revision of the NanoUI templating system. 
Conflicts:
	code/ATMOSPHERICS/components/omni_devices/filter.dm
	code/ATMOSPHERICS/components/omni_devices/mixer.dm
	code/game/dna/dna_modifier.dm
	code/game/machinery/cryo.dm
	code/game/machinery/kitchen/smartfridge.dm
	code/modules/nano/nanoexternal.dm
	code/modules/nano/nanomanager.dm
	code/modules/nano/nanoui.dm
	code/modules/power/apc.dm
	code/modules/power/smes.dm
	code/modules/reagents/Chemistry-Machinery.dm
	nano/css/shared.css
	nano/js/nano_update.js
	nano/templates/escape_pod_console.tmpl
 2014-07-15 07:22:15 -04:00
KeleniusandZomgPonies c54b9e3626 Slime update 
Conflicts:
	baystation12.dme
	code/modules/mob/living/carbon/metroid/death.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/say.dm
	code/modules/mob/transform_procs.dm
	code/modules/reagents/Chemistry-Recipes.dm
	maps/tgstation2.dmm
 2014-07-15 00:50:41 -04:00
WhitellamaandZomgPonies 88d4e49efe Fixed issues with cans complaining twice when trying to drink unopened and with transfering fluids between closed cans 
Conflicts:
	code/modules/reagents/reagent_containers/food/cans.dm
 2014-07-14 06:46:38 -04:00
mwerezakandZomgPonies 44e2f8acf2 Fixes human internal organs list 
Conflicts:
	code/modules/events/organ_failure.dm
	code/modules/organs/blood.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/surgery/ribcage.dm
 2014-07-13 08:51:55 -04:00
HubblenautandZomgPonies 956706c7cf Fix: Painkillers stay in body for decent time 
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
 2014-07-13 08:34:30 -04:00
HubblenautandZomgPonies 776369d9ee Health Analyzer can read all types of beneficial medicine 
Conflicts:
	code/game/objects/items/devices/scanners.dm
	code/modules/reagents/Chemistry-Reagents.dm
 2014-07-13 08:32:14 -04:00
mwerezakandZomgPonies 2ff4a975f0 Sterilizine reduces germ_level on contact 
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
 2014-07-13 08:19:50 -04:00
mwerezakandZomgPonies cf52f9e734 Fixes reagent_containers not being usable for surgery 2014-07-13 07:42:10 -04:00
HubblenautandZomgPonies b9be3e6ed7 Stops buckled mobs from slipping (for now) 
Conflicts:
	code/game/turfs/simulated.dm
 2014-07-13 06:48:17 -04:00
ZuhayrandZomgPonies b8e3d45671 Cleaned up some reagent stuff, made Skrell alcoholics a legit issue, fixed IPC getting phoron contamination from clothing. 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/setup.dm
 2014-07-12 21:58:54 -04:00
ChinskyandZomgPonies 71169c7903 Made monkey cube subtypes define what type of monkey they spawn instead of weird switch in Expand(). 
Rewrote belly expanding accordingly. Also now you get a living monkey from the monkey.

Conflicts:
	code/modules/reagents/reagent_containers/food/snacks.dm
 2014-06-24 12:02:29 -04:00
ChinskyandZomgPonies d1932f7045 Moved same code into single organ helper to handle embedding. 
Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/organs/organ_external.dm
 2014-06-24 11:46:56 -04:00
ChinskyandZomgPonies 0626abe799 Lowers caused damage to make it destroy organs rarer. 2014-06-24 11:42:45 -04:00
ChinskyandZomgPonies 2cf6acd4e7 Monkey cube now expand when eaten, leading to !!FUN!! 2014-06-24 11:42:34 -04:00
ZuhayrandZomgPonies 38559ab477 Makes forks usable. 
Conflicts:
	code/game/objects/items/weapons/kitchen.dm
	icons/obj/kitchen.dmi
 2014-06-22 10:58:50 -04:00
Mloc-ArgentandZomgPonies 8a5079d006 atmos: fix everlasting fires 
Fires were checking against a non-reduced air sample for existance, so
the reduced sample wasn't working in zburn when it failed the check.
Also fixed volatilefuel not being scaled in the phoron reagent.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/ZAS/Fire.dm
	code/modules/reagents/Chemistry-Reagents.dm
 2014-06-22 10:54:19 -04:00
ZomgPonies a6167c56eb Temporary exploit fix pending permanant solution from upstream. Thanks for the find! 2014-06-22 06:49:26 -04:00
mwerezakandZomgPonies b64441cb26 Fixes FEA temperature_expose() being used... 
...instead of ZAS fire_act().

Conflicts:
	code/game/gamemodes/blob/theblob.dm
	code/game/machinery/doors/airlock.dm
	code/game/objects/structures/window.dm
	code/game/turfs/simulated/walls_mineral.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/reagents/reagent_dispenser.dm
 2014-06-22 02:03:42 -04:00
Necaladun 3bfcaaec88 i'm still an idiot 
fucked up more things...should work now :3

Cannot compile to properly test because of other errors that aren't mine
for once
 2014-06-22 08:32:33 +09:30
Necaladun 55a61a67f3 negative hallucination amounts is bad 
thanks UC. Negative hallucinations may result in people seeing too much
reality.
 2014-06-22 08:17:34 +09:30
Necaladun e17f2a0899 citalopram fix 
Citalopram now functions as an antipsychotic, reducing hallucinations. 1
unit will counter 1u of mindbreaker, but not remove it - synaptazine for
that.
 2014-06-22 08:12:41 +09:30
ChinskyandZomgPonies 47327042eb Fixes #5264 
Viruses are properly transferred to spilled blood now.
Antigens prevent from infection properly.
Lowered frequency of blood puddle virus check to cut down on processing.

Conflicts:
	code/game/turfs/simulated.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/organs/blood.dm
	code/modules/reagents/Chemistry-Reagents.dm
 2014-06-21 13:02:11 -04:00
ChinskyandZomgPonies e14c19f457 Changed color mixing to use weighted average instead of addition. Should help against values reaching FF too fast. 
Adjusted color mixing helper to use inbuilt procs.
 2014-06-20 12:08:30 -04:00
mwerezakandZomgPonies 6e7139087e Fixes human/checkarmor getting the armour... 
...value for the wrong body part.

Whoever put ran_zone() in there wasn't thinking straight, as it's not
going to affect the part that actually gets damaged.
 2014-06-19 09:39:44 -04:00
mwerezakandZomgPonies 4a2993b20b Separates the sharp flag into edge and sharp 
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.

Conflicts:
	code/__HELPERS/unsorted.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/silicon/robot/component.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/projectiles/gun.dm
	code/modules/reagents/reagent_containers/syringes.dm
	code/modules/surgery/eye.dm
 2014-06-17 06:51:51 -04:00
ZomgPonies 4cfa12aae3 Chemistry Reagent runtime 2014-06-17 04:51:06 -04:00
ZomgPonies ddfae9a035 Got another shuttle controller down. One to go. 2014-06-16 21:42:06 -04:00
ZomgPonies 386b1b8307 Fixes a bunch more hurt -> harm checks 2014-06-14 01:02:29 -04:00
ZomgPonies 1425001472 Bleh addiction 2014-06-09 19:01:10 -04:00
ZomgPonies 23f2885c01 Moar addiction fixuns 2014-06-09 01:54:03 -04:00
ZomgPonies ff5ac9b8a3 Moar addiction fixuns 2014-06-09 01:08:30 -04:00
ZomgPonies 0e7ad2e4d5 Addictiveness fix 2014-06-08 23:00:57 -04:00
ZomgPonies 2c57ec96ae First commit of the addiction system 2014-06-08 21:55:03 -04:00
ErthiloandZomgPonies d3eeb7945d Hotfix for Zombie Powder not ever clearing Fakedeath. 2014-06-08 16:24:48 -04:00
ZomgPonies 4cfeada9d7 Added baggies for drugs, aww yeah 2014-06-06 04:16:39 -04:00
ZomgPonies b23b5b62d9 Made hyperzine same color as salt, because HAHA 2014-06-06 02:43:38 -04:00