Commit Graph

10 Commits

Author SHA1 Message Date
Kashargul 6f1d6c524d Simple mob port [IDB IGNORE] (#18236)
* first adjustements

* few more

* construct

* next

* next set

* next

* next

* next

* next

* next

* .

* last non modular set

* make it compile

* .

* .

* change that

* synx

* teamush

* override fix

* TEAMUSH

* adds organ sell element

* adds pick color

* get rid of these chompcomments

* removes chomp comments

* Update gaslamp_vr.dm

* zipgun

* zip and synx

* fixes synx

* Update topic.dm

* move the trash verbs

* .

* .

* .

* port

* Update rakshasa_trap.dm

* Update slug.dm

---------

Co-authored-by: C.L. <killer65311@gmail.com>
Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
2025-08-22 17:24:51 -04:00
Kashargul 2556102719 only tab indentation (#17408)
* only tab indentation

* .
2025-03-23 15:28:15 +01:00
Yoshax 737205d945 Adds cryogenic stasis to hydroponics trays 2016-11-19 02:26:39 +00:00
Kelenius 10915eae24 Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/customitems/item_defines.dm
	code/modules/projectiles/guns/launcher/syringe_gun.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/pill.dm
	maps/exodus-1.dmm
2015-05-15 11:28:05 +03:00
GinjaNinja32 3fc9d89163 Fixes vines not being vines. 2015-05-12 01:56:51 +01:00
Kelenius 317abc6b79 Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
	code/datums/recipe.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/effects/effect_system.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/extinguisher.dm
	code/game/objects/items/weapons/mop.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/organs/organ_internal.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/exodus-1.dmm
2015-04-28 10:49:26 +03:00
Zuhayr 1070a8f63c Adds weedkiller smoke checks to hydro trays and spreading plants. 2015-04-01 07:25:09 -07:00
Zuhayr 23b93e7540 Added tray lighting verb. 2015-02-22 17:34:41 +10:30
Zuhayr fdf0360a69 Collapsing all fruit into one object type. Refactoring reagent grinder and removing juicer. WIP. 2015-02-04 10:55:33 +10:30
Zuhayr 93cf4f73c5 More work on the vine system, fixing multiple bugs. 2015-02-04 10:52:48 +10:30