Commit Graph

122 Commits

Author SHA1 Message Date
Fox-McCloud 54f59b9899 Pass II 2015-07-09 19:51:40 -04:00
Fox-McCloud 0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
Tigercat2000 3a45d52fe0 Fix remaining non-returning Destroys()
Plus a little refactor to mining flaps and spacepod doors- they now use
CanAtmosPass instead of manually setting the turf to no-atmos-passing
2015-07-06 09:20:39 -07:00
Fox-McCloud b740f8930e Merge pull request #1377 from Robertha89/master
Definitely Not Ian
2015-06-25 02:31:14 -04:00
Robertha89 b7e43286a6 New hat for Ian and new tool for pets
while life serve the same function, it is somewhat difficult to make,
the lazarus injector revives any neutral simple_animal on use, and can
turn hostile animals friendly towards them if it has been emped. so five
of those has been added to the crittercare.

Most importantly, Ian got  a new mask, the mustache.
2015-06-24 04:37:48 +02:00
Robertha89 fc6ec4982f Pet Collar Bug Fix
If you had Ian with a pet collar name like spot, and you gave him say a wizard name, then he would deafault to his real_name over his name, and making it impossible to restore the name on the collar.
2015-06-24 03:20:32 +02:00
Tigercat2000 d20298e996 -tg- atom pooling system, qdel changes
This commit first and foremost ports the -tg- atom pooling system, and
removes the old experimental system entirely.

Secondly, this PR modifies the qdel system to use a -tg- lookalike
"destroy hint" system, which means that individual objects can tell qdel
what to do with them beyond taking care of things they need to delete.
This ties into the atom pooling system via a new hint define,
QDEL_HINT_PUTINPOOL, which will place the atom in the pool instead of
deleting it as per standard.

Emitter beams are now fully pooled.

Qdel now has semi-compatibility with all datum types, however it is not
the same as -tg-'s "Queue everything!" system. It simply passes it through
the GC immediately and adds it to the "hard del" lists. This means that
reagents can be qdel'ed, but there is no purpose as of yet, as it is more
or less the same as just deleting them, with the added effect of adding
logs of them being deleted to the garbage collector.
2015-06-21 15:47:57 -07:00
Nienhaus 060318cb29 Adds Deer ;D 2015-06-15 18:50:39 -05:00
ZomgPonies 47ab558908 Merge pull request #1210 from TheDZD/CLICK-CLICK
Adminbooze Crab Proc Uncommenting
2015-05-29 21:44:45 -04:00
DZD e2c5c2b4d5 Adminbooze crab proc uncommenting
Uncomments and fixes up the adminboozey GetMad() proc that crabs have.
The only way to call it currently is via atom proccall. It turns a crab
into a furious machine of murder.
2015-05-28 22:04:15 -04:00
Fox-McCloud 46b64986d0 darn you 2015-05-28 20:00:05 -04:00
Fox-McCloud 5d3e837b4a Mob Refactor+Update and Pet Collars 2015-05-28 00:20:25 -04:00
ZomgPonies 32c00989d6 Tigercat's fixes 2015-05-26 20:26:26 -04:00
ZomgPonies 1935a82afe 2/3 of port done 2015-05-25 19:48:13 -04:00
Krausus f45737c097 Fixes animal milking runtime
Also simplifies the way milk is generated, since the old way was hacky
and runtiming
2015-05-14 08:14:23 -04:00
ZomgPonies c29d2f4dac Merge pull request #1008 from tigercat2000/VcrawlFixes
Generic ventcrawling + Bugfixes
2015-05-12 14:35:01 -04:00
Tigercat2000 1266df1f3d Generic ventcrawling + Bugfixes
This commit makes the ventcrawling system operate independant of
ventcrawling verbs. Every type of /mob/living now has a ventcrawling
variable, which allows them to interact with the ventcrawling system if
set to 1 or 2. The AltClickOn() defines for each ventcrawling mob have
been removed, and replaced with a single AltClick() define on ventcrawl
machinery.
2015-05-11 06:28:44 -07:00
Tigercat2000 625dbb5295 Merge remote-tracking branch 'upstream/master' into LightShit
Conflicts:
	code/modules/hydroponics/trays/tray.dm
	code/modules/hydroponics/vines.dm
2015-05-10 13:56:28 -07:00
Tigercat2000 e1249fc640 Lighting overhaul.
This commit overhauls the lighting system to Bay12 standards. It is better
in pretty much every way.
2015-05-10 12:03:27 -07:00
FalseIncarnate db9d9fc647 Botany / Xenobotany Update
Largely a port of https://github.com/Baystation12/Baystation12/pull/8038
(Credit to Zuhayr for his hard work on botany)

Breakdown of the port:
- Plant traits have been expanded drastically
- You want a bio-luminescent tomato that explodes into a cloud of acid
when thrown or stepped on? Or maybe a corn vine that entangles people
and injects them with mannitol and it's harvests that can be used as a
battery? Totally possible.
- Adds new random seeds! Replaces the egg-plant seed in the exotic seeds
crate from cargo with 2 of these.
- Literally random, they have randomly generated stats, chemicals, and
traits. Great for researching, and/or wasting cargo's supply points.
- Plant analyzers can now print off the last scan they recorded, meaning
you can distribute copies of the report to validate your claims of
having the dankest weed on station.
- Potatoes, carrots, watermelons, soybeans, and pumpkins can all be
sliced/diced/carved with ANY sharp object, such as knives, hatchets,
glass shards, and e-swords.
- This should give the chef a bit more room to make it look like he
actually is doing the work by slicing up fries by hand. The processor
still also works.
- New reagent: Wood Pulp
- Currently has no use in recipes, but any plant with this reagent in it
can be chopped into planks with a hatchet. Did someone order some
Ambrosia Deus planks?
- Also, vines with woodpulp are dense. You have been warned.

Now onto the stuff I did in addition to the stuff from Bay.
- Fixed typos where plasma was mistakenly called "phoron" in the port.
(Sorry bay)
- Replaced bay's botany mutation chances with our tiered mutation
system.
- Re-re-added tobacco, space tobacco, tea aspera, tea astra, coffee
arabica, and coffee robusta.
- Re-enabled the rolling of joints
- Made it possible to hand-roll cigarettes from tobacco / space tobacco.
(A requested / promised addition)
- Just like with joints, it will inherit any chems in the tobacco, has
the same reagent capacity as a joint, but looks and smokes like a cig
(lasts as long as the cigarettes) with a different name/description to
differentiate it from pre-made cigs.
- Corn can now be juiced in the grinder, in addition to grinding it.
Grinding corn will result in it's contained reagents (like corn starch),
while juicing corn will result in corn oil.
- Re-added the additional plant analyzer information when scanning trays
(displays age, weed level, etc)

Also cleaned up the recipes_microwave.dm file, removing the commented
out recipes that were distributed to the other machines during the
Kitchen Overhaul. Shortens the file a bit and makes it more readable.

I probably forgot stuff, so I will add things as I remember them / they
get pointed out.
2015-05-09 06:00:24 -04:00
Matt a59f797752 Addition
What it says on the tin.
2015-04-25 22:46:12 +02:00
ComicIronic 65ea7e07d9 Ventcrawl Overhaul
Ventcrawling mobs now no longer get a teleportation menu, instead, they
are put inside the vents, the client gets an overlay of the pipes in the
pipe network, and it is up to them to navigate.
2015-04-20 13:09:04 -07:00
Fox-McCloud 595fb2a34c [Goonchem] Pipettes, Fixes, and Tweaks (again) 2015-03-31 00:16:58 -04:00
Artorp e7434672bc Fixes meat harvesting of some simple_animals 2015-03-22 05:08:32 +01:00
ZomgPonies 8a575700b9 Finally got colored blood working properly 2015-03-03 13:45:46 -05:00
ZomgPonies efcbfebf99 Emergency corgi runtime Fix 2015-03-02 11:22:21 -05:00
ZomgPonies ba2b5589e9 Ported CorgiUI 2015-02-28 10:59:14 -05:00
Markolie 672305e034 Adds a "params" parameter to attackby(), so it keeps track of pixel_x and pixel_y among other things 2015-02-22 22:12:11 +01:00
Markolie aee4626ed9 Slow down milking Betsy 2015-02-22 21:31:28 +01:00
Markolie 982102a407 Standardize mutations 2015-02-22 19:04:43 +01:00
Markolie f5e2d82953 (Plasma decal already fixed) - Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/machinery/atmoalter/canister.dm
2015-02-17 02:12:22 +01:00
Markolie d7f17f6eba Bug fixes, give roboticist toolbelt, AI recall shuttle option 2015-02-17 01:04:04 +01:00
Fox-McCloud 1e4d1df880 Merge remote-tracking branch 'upstream/master' into Cargo 2015-02-14 22:02:39 -05:00
Fox-McCloud 0de7e1035c Cargo Supplies 2015-02-14 21:21:09 -05:00
Markolie 0b937d5ace Emag refactor 2015-02-13 16:59:20 +01:00
Mark van Alphen 2291981c15 Rename Fox.dm to fox.dm
For some reason this didn't stick
2015-02-10 17:16:32 +01:00
Markolie 7285f39fc1 Defib update, cell path update 2015-02-09 16:12:01 +01:00
Markolie c520856716 Additional jobban options, minimum account age for antags 2015-01-31 19:48:48 +01:00
Markolie 71a9a358e1 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	maps/cyberiad.dmm
2014-12-22 15:14:35 +01:00
Fox-McCloud 03c61ed3ab Foxes 2014-12-22 08:32:32 -05:00
Markolie d440784473 Syndicat faction 2014-12-21 20:41:56 +01:00
Fox-McCloud e76c8f26f3 Stamina 2014-12-12 06:52:20 -05:00
Markolie 3be1a2553e Bug fixes, wording changes 2014-11-25 22:56:12 +01:00
melandor0 59f73acfd3 Traitorstation Fixes + SyndieCat
Fixes some things with traitorstation and adds SyndieCat.
2014-09-02 13:53:11 +02: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
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
alex-gh 845edf79d5 Added E-N emagging 2014-06-18 01:38:48 +02:00
Aranclanos 23387777c2 Ian will stop making the MC wait for his movements
Conflicts:
	code/modules/mob/living/simple_animal/friendly/corgi.dm
2014-06-08 16:23:17 -04:00
MrPerson 320a06f8c9 Make sure clones don't already have a body
CASE: Guy gets backed up at genetics. Guy gets facehugged. Guy pops as a xeno. Guy gets cloned. Alium is left clientless.

Conflicts:
	code/game/machinery/cloning.dm
2014-05-04 17:06:20 -04:00
Rob Nelson 9227481a8a Standardize windows.
Conflicts:
	code/WorkInProgress/buildmode.dm
	code/game/machinery/doors/airlock.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/weapons/twohanded.dm
	code/game/objects/structures/window.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
	code/modules/mob/living/simple_animal/constructs.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
2014-04-19 19:36:33 -04:00