cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-21 07:42:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,527 Commits 26 Branches 2 Tags
288af9f92cb15d93b0956a8b32b2f47ebb0dfd93
Commit Graph

587 Commits

Author SHA1 Message Date
Whitellama
6b1ba1b6a3 Fixed #5870: Glasses being labeled both 'glass' and 'Drinking glass' inconsistently 
Conflicts:
	code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
 2014-08-03 15:28:20 -04:00
ZomgPonies
c1801306a7 Merge pull request #331 from VampyrBytes/master 
fix for customizable foods
 2014-07-27 12:00:09 -04:00
Zuhayr
c0ba021bcd Added portable_atmospherics to hydroponics machine path, couple of other tweaks. 
Conflicts:
	code/datums/supplypacks.dm
	code/game/machinery/hydroponics.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/tgstation2.dmm
 2014-07-26 14:03:46 -04:00
VampyrBytes
b2b443cc4d fix for customizable foods 
names - no more meat, meat and egg sandwich sandwich sandwich type names
- this would now be an egg and double meat triple decker sandwich

commented sandwich.dm out. was almost duplicate code, but if a sandwich
was being made with a shard or customizable food, it was making it a
different object (/food/snacks/csandwich instead of
food/snacks/customizable/sandwich), only thing it processed that the
other didn't was if there was a shard in the food, which is now dealt
with in customizable
 2014-07-26 07:25:47 +01:00
Zuhayr
ebb9f724aa Hydroponics rewrite, details will be in PR. Big commit. 
Conflicts:
	baystation12.dme
	code/controllers/master_controller.dm
	code/game/gamemodes/events/spacevines.dm
	code/game/machinery/seed_extractor.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/mob.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/food/snacks/grown.dm
	icons/obj/hydroponics.dmi
	maps/tgstation2.dmm
 2014-07-25 11:10:01 -04: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
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
ESwordTheCat
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
Zuhayr
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
ZomgPonies
aafa11712a Removal of virus1/disease1 system. So long GBS/Jungle Fever, you'll be missed! 2014-07-16 00:53:08 -04:00
Whitellama
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
Hubblenaut
b9be3e6ed7 Stops buckled mobs from slipping (for now) 
Conflicts:
	code/game/turfs/simulated.dm
 2014-07-13 06:48:17 -04:00
Chinsky
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
Chinsky
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
Chinsky
0626abe799 Lowers caused damage to make it destroy organs rarer. 2014-06-24 11:42:45 -04:00
Chinsky
2cf6acd4e7 Monkey cube now expand when eaten, leading to !!FUN!! 2014-06-24 11:42:34 -04:00
Zuhayr
38559ab477 Makes forks usable. 
Conflicts:
	code/game/objects/items/weapons/kitchen.dm
	icons/obj/kitchen.dmi
 2014-06-22 10:58:50 -04:00
mwerezak
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
mwerezak
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
386b1b8307 Fixes a bunch more hurt -> harm checks 2014-06-14 01:02:29 -04:00
ZomgPonies
4cfeada9d7 Added baggies for drugs, aww yeah 2014-06-06 04:16:39 -04:00
Zuhayr
c840622c82 Added smaller spraybottle for drones. 2014-05-31 18:11:48 +02:00
ZomgPonies
11a1deb1ac Trying to cut down on attack lock spam 2014-05-24 17:17:38 -04:00
SamCroswell
c4d7c91e76 Map Bugfixes, some past due Ninja changes 2014-05-10 22:25:58 -04:00
iamgoofball
424a2522b9 CIVILLIAN OVERHAUL UNO: Chef and the Kitchen 
Conflicts:
	baystation12.dme
	code/modules/reagents/reagent_containers/food/snacks.dm
	icons/obj/food.dmi
	icons/obj/kitchen.dmi
 2014-05-03 21:15:41 -04:00
Zuhayr
abcb0bc686 Lousy goddamn indentation. 2014-05-03 17:36:17 -04:00
Zuhayr
a7f0508a1e Attempting to stop IPC from eating and drinking. 2014-05-03 17:36:05 -04:00
Rob Nelson
56d8ce28c8 Part 1 of economy rework: Spacecash refactor - See commit for full changelog. 
* Implements stacking and stack overlays
 * Simplified tiers of cash (1,10,100,500,1000, may remove 500)
 * Simplified API (dispense_cash, count_cash)

Conflicts:
	code/modules/admin/admin_verbs.dm
	code/modules/admin/verbs/debug.dm
	code/modules/economy/ATM.dm
 2014-04-19 20:47:41 -04:00
ESwordTheCat
c43652b33a Okay shards converted to pool usage now. 
Conflicts:
	code/game/machinery/computer/arcade.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/objects/structures/displaycase.dm
	code/modules/mining/mine_turfs.dm
	code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
 2014-04-19 19:57:53 -04:00
Necaladun
d3757b9413 Hyperzine bottle 
A pre-spawned bottle of hyperzine
 2014-04-16 09:49:20 +09:30
RavingManiac
9bea0a097a trans_to_ingest now used for consumption of food, drink and pills instead of trans_to. This adds a ten second delay between ingestion and addition of the reagents to the body. 
Conflicts:
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/reagent_containers/food/cans.dm
	code/modules/reagents/reagent_containers/food/condiment.dm
 2014-04-05 17:39:14 +02:00
Jeremy Liberman
c74ff2d653 Fixes biogenerator typo, improper beaker splashing, and allows glass beakers to refill botany trays 
Conflicts:
	code/modules/reagents/reagent_containers/glass.dm
 2014-04-03 21:42:33 +02:00
ZomgPonies
f1cdebaa60 Fixed custom item 2014-03-14 03:41:34 -04:00
ZomgPonies
c751ee454c Small fixes 2014-03-06 22:45:38 -05:00
ZomgPonies
22765ac4d7 autoinjector 2014-03-06 20:13:48 -05:00
ZomgPonies
ec225e3344 fixes flatdough sprite 2014-03-06 18:22:57 -05:00
ZomgPonies
1ab8df4b13 Garbage collection fixes 2014-02-19 20:24:31 -05:00
Incoming
917370a608 Jay Owen demands that this pull be merged. 
Crush a can for Jay Owen.

He has leukemia, please crush a can for Jay Owen.

His only wish is to see a can crushed live in our game.

Sprites by Nienhaus

Conflicts:
	code/game/objects/items/trash.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	icons/obj/janitor.dmi
 2014-02-16 05:42:55 -05:00
Fox-McCloud
4cd875c88a Various Tweaks and Fixes 
Adds a replacement for Doctor's Delight (For Syndicakes, valid salad,
etc), fixed chem dispenser NanoUI sizing, and change plasma color from
orange to the canonical purple.
 2014-02-02 06:27:13 -05:00
RKF45
c69ddf76ec Reintroducing the dough-based cooking system. 
Conflicts:
	code/modules/food/recipes_microwave.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	icons/obj/food.dmi
 2014-02-01 19:22:22 -05:00
Ergovisavi
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
Ergovisavi
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
Fox-McCloud
57f113b427 Chemistry and Brain Damage 2014-01-29 00:58:58 -05:00
Rob Nelson
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 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
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
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
ZomgPonies
cb5367ed96 Switching cable coils to stacks 2014-01-21 21:23:26 -05:00
ZomgPonies
90496be20a Standardized intent names so it's all harm. Fuck you hurt. 2014-01-19 08:30:50 -05:00
fleure
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