Commit Graph

59 Commits

Author SHA1 Message Date
warior4356 93b43721f3 Adds empty cig packets 2020-07-14 01:05:12 -07:00
Fox McCloud 8ce3b1da16 Merge pull request #12932 from AffectedArc07/var/const-to-define
Replaces all var/const with #define
2020-03-14 15:33:44 -04:00
AffectedArc07 5baaabe12e Merge branch 'master' into var/const-to-define 2020-03-09 10:33:59 +00:00
Fox McCloud 47263ded27 Merge remote-tracking branch 'upstream/master' into cig-tweaks 2020-03-08 22:35:49 -04:00
Fox McCloud 4d9c89bdc0 menthol 2020-03-06 23:48:32 -05:00
Fox McCloud c059b6ba95 Cigarette Tweaks 2020-03-04 00:32:39 -05:00
Fox McCloud c55ce4aab3 Adds CBD 2020-02-23 19:46:29 -05:00
AffectedArc07 c64bc93649 Replaces all var/const with #define 2020-01-28 21:25:20 +00:00
Fox McCloud 5194094d3a Refactors Zone Selection (#12523) 2019-10-08 21:11:09 -04:00
Fox McCloud 9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
farie82 0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Arkatos1 b2e7149f1d Adds new inhand sprites 2019-05-06 16:08:38 +02:00
FalseIncarnate d4bada645a Fixes invisible egg and donut boxes
Also removed duplicate instances of the pizza box icons
2018-07-22 15:33:21 -04:00
Fox McCloud 202fbe92fb Cleans Up Medbot Code, Re-Allows Syndicate Medbot 2018-05-29 12:15:04 -04:00
Fox McCloud 5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Piccione 8799c0cf42 Put the correct drug id in the cigarette for THC 2018-03-08 23:24:33 +01:00
Piccione 35f1956db7 Switched the Space Drugs in the Weed Cigarettes with more healthy THC 2018-03-08 23:18:54 +01:00
Piccione 3bcc12bd94 Added Weed Packets 2018-03-06 22:22:10 +01:00
Sam fca8a46c49 Fixes errant improper capitalised references 2017-06-14 08:00:18 +01:00
Sam 07e0f768d6 Using Weight Defines 2017-05-27 16:34:49 +01:00
Fox-McCloud 5631d36ff8 Converts Most Destroys to use QDEL_NULL 2017-04-04 23:08:41 -04:00
Markolie 9d9e957df1 Tool overhaul (usesound & toolspeed), wire descriptions/ghost interaction, add additional tools, refactor can(t)_hold 2017-03-05 19:53:20 +01:00
Fox-McCloud 51bbe8c466 Merge remote-tracking branch 'upstream/master' into botany-rework 2017-01-26 06:53:18 -05:00
Fox-McCloud 36bfee25dc last of the missing stuff, hopefully 2017-01-24 18:33:22 -05:00
Fox-McCloud ea8080e6c9 Makes Reagents Holder Process and Refactors NOREACT 2017-01-14 20:09:49 -05:00
Fox-McCloud a1b8205fdd food 2016-11-29 08:45:46 -05:00
Fox-McCloud bde5755916 Implements Fire System 2016-07-29 13:24:09 -04:00
Fox McCloud 4d3b818232 Merge pull request #5048 from Chakirski/bug1
Cigpacks Examine Fix
2016-07-14 18:54:23 -04:00
Chakirski 6c8fa9f688 cigs... 2016-07-14 10:45:52 -05:00
monster860 009dcaa2d8 Merge branch 'master' into w_class 2016-07-10 09:29:12 -04:00
monster860 3df85518e1 Removes .0 at the end of w_class numbers 2016-07-08 12:26:34 -04:00
Tigercat2000 71e5344a98 Mass replace 2016-07-07 19:34:02 -07:00
Tigercat2000 78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000 9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
FalseIncarnate fca3996fcb Cigarette Pack Functionality
Adds the ability to put cheap lighters and individual matches into
cigarette packs at the cost of cigarette slots.
- A cheap lighter takes up the space of 2 cigarettes
- Zippos won't fit, they are too boxy.
- A match takes up the space of 1 cigarette.

Increases the w_class of all lighters (cheap, zippo, and special zippos)
from 1 to 2
- Still fits in pockets, just can't shove as many into a box as they
take up more space

Adds the ability to light and put out matches on your shoes.
- Good for when you lose that matchbox (or shove matches into a cig
pack) and need a light.
- Works on all shoes, from the humble brown shoes to the devious
syndicate magboots, and even the clown shoes.

Based on the suggestion from:
http://nanotrasen.se/phpbb3/viewtopic.php?f=12&t=6880
2016-01-19 02:49:00 -05:00
Fox-McCloud 7a766067ee typo 2015-12-15 22:11:00 -05:00
Fox-McCloud 6105699160 More Medbot Skins 2015-12-15 20:02:29 -05:00
Fox-McCloud 318c464f94 Aquarium Starter Kit 2015-11-08 07:38:09 -05:00
Fox-McCloud 4687620436 Adds Random Cigs 2015-11-04 22:47:18 -05:00
Tigercat2000 0603f73232 Bay12 examine overhaul.
This commit overhauls the examine system to baystation's latest system,
including a more efficient verb approach, and a new status panel tab,
which shows more information for pre-defined objects.
2015-09-14 11:51:40 -07:00
FalseIncarnate 9480b77514 Sushi Update
Adds multiple types of sushi, made from various ingredients including
rice, egg, fish, and fish eggs.
- Most sushi recipes are made via table-crafting, though Tamago Sushi
requires a grill to prepare.

Adds multiple new types of fish for the fish tanks! Their eggs can be
purchased in the CritterCare vendor.
- Catfish
- Will periodically reduce the filth level of the tank, helping keep it
clean while you are busy.
- Feederfish
- Will sometimes sacrifice itself to add food to the tank for other
fish. Will not sacrifice if it is the last fish, or if the food level is
sufficiently high
- Shrimp
- Salmon
- Electric Eel
- Glofish
- Will produce light if the the tank light is off.

Adds fish items for each fish you can raise!
- Most fish are simply weak weapons you can slap people with.
- Sharks and baby carp do slightly higher damage, and make a biting
sound on hit
- Sharks can have their teeth removed by using a wirecutter on them.
- Toothless sharks no longer do more damage than normal fish, nor do
they make the bite sound
- Shark teeth will be used in some future recipes
- Salmon and catfish can be cut into filets with a knife
- Shrimp and feederfish can be eaten raw, though they aren't very
filling
- Glofish, you guessed it, glow! They give off light like a weaker,
green-colored flashlight.
- Clownfish are slippery like banana peels! HONK!
- Electric eels do not zap people, but will be used in a future crafting
recipe or two for an improvised stun weapon.

Tweaked the rate at which filth will accumulate in a tank, so hopefully
it won't be a full time job to maintain a single goldfish.
- Tanks with no fish will get dirty at a lower rate than before, and
will not continue to get dirty if the filth_level is 7.5 or higher
- Previously: 25% chance to increase by 0.1
- Now: 15% chance to increase by 0.05
- Tanks with at least one fish now will get dirty slightly less often
- Previously: 25% chance to increase by 0.1 with a 30% chance to
increase by 0.1 per fish if they ate that cycle
- Now: 10% chance to increase by 0.1 with a 25% chance to increase by
0.1 per fish if they ate that cycle

Using a fish net on a fish tank will now let you select a fish to
remove, instead of selecting one at random.
- Catching a fish with the fish net will now remove it from the tank and
drop the appropriate fish item at your feet.

Added support for special cooking via cooker machines (deepfryer, cereal
maker, old candy maker, old oven)
- Only the deepfryer currently utilizes it (as the other machines aren't
used currently)
- Inserting specific items will cook them into a new item instead of
simply frying them!

New deepfryer recipes:
- Tofu can be deepfried into Fried Tofu!
- Raw sticks (from slicing potatoes) can be deepfried into a bag of
chips!
- Bananas can be deepfried into Fried Bananas! (old recipe still
possible)
- Corn can be deepfried into a bag of Corn Chips!
- This is the same as a bag of chips, except Space Mexican
- Shrimp can be deepfried into Fried Shrimp!

Began phase 1 of re-organizing/dividing food icons and code into
multiple files
- The existing icon file was nearing capacity, and the code file was
incredibly long
- This re-organization will make it easier for coders to find, edit, and
group similar/related foods together, without worrying about overfilling
the food icon file
- This means we can add way more foods in the future without worrying
about the icon being full!

Sprites courtesy of FullOfSkittles, with a few of my own horrendous
recolors/edits.
- Not all of the new sprites are currently used, but are planned for use
in a near-future PR to further expand the food options available.
2015-08-23 00:22:31 -04:00
Fox-McCloud 6e87b96501 Pass 3 2015-07-08 01:34:53 -04: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
Fox-McCloud 1c1eec3210 Tweaks and Fixes 2.0 2015-05-22 16:29:12 -04:00
Krausus c000cb4c78 Doubles cigar(ette) capacity, tweaks base nicotine 2015-05-02 23:08:17 -04:00
Krausus 73983dc433 Fixes putting cigars and pipes into cigarette packs 2015-05-01 04:28:18 -04:00
Krausus e5f0d0bb6a Changes nicotine pre-generation and fixes lacing 2015-05-01 01:41:19 -04:00
Fox-McCloud d1932c0f64 [Goonchem] Transition to Goonchem 2015-03-27 05:41:45 -04:00
Fox-McCloud dbb04f4dbb [Goonchem] Few Additional Chemicals 2015-03-25 03:50:54 -04:00