Commit Graph
1209 Commits
Author SHA1 Message Date
Fox-McCloud 64b2bb3784 Merge remote-tracking branch 'upstream/master' into material-datums 2015-09-04 22:53:20 -04:00
Fox-McCloud ea6bfdf758 upgradeable recycler 2015-09-04 19:41:42 -04:00
Fox-McCloud a019934e9e Pass I 2015-09-04 05:18:48 -04:00
Fox-McCloud 9b8342897e Cult Tweaks 2015-09-02 21:08:08 -04:00
Tigercat2000 7f4ac72910 Progress bars + Wall Rationalization
This commit does the following:
 - Ports progress bars from -tg- (tgstation/-tg-station#9921)
 - Refactors wall attackby code to make it 100% less insane; Instead of
   manually checking every little thing, it uses do_after,
   consequentially, making the new progress bars affect dealing with walls
   as well.

Wall code makes a tiger sad.
2015-08-31 13:38:51 -07:00
Fox-McCloud 110abbda59 R&D Lockbox Origintech 2015-08-25 21:24:09 -04: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 9e882aa22a Merge pull request #1739 from Markolie/clicking
You can now click on an inventory slot instead of a specific item
2015-08-14 21:32:37 -04:00
Markolie 85c4b99973 You can now click on an inventory slot instead of a specific item 2015-08-14 01:39:28 +02:00
Markolie 0598ebecb9 Remove unused variable causing a warning 2015-08-13 20:25:49 +02:00
Markolie d1e776a8f2 Give syndi toolbox insulated gloves 2015-08-12 02:26:21 +02:00
DZD 66688f4dbb Fixes conflicts in icons/obj/gun.dmi. 2015-07-24 15:29:20 -04:00
SamCroswell d84dfe5a49 ERT Rework - Code Changes 2015-07-20 19:37:56 -04:00
DZD 29e70854e9 Fix merge conflicts
🖕 map conflicts over lines that weren't even edited by both upstream
and this branch.
2015-07-15 22:28:12 -04:00
Fox-McCloud e4d6acb538 Changes a few del to del() 2015-07-10 23:28:08 -04:00
DZD 412443dbf1 Fix non-icon merge conflicts 2015-07-10 19:57:59 -04:00
DZD d4cf433e7c Various fixes, changes, additions, and removal of old features.
More changes
2015-07-10 19:41:27 -04:00
Fox-McCloud 0dbea7621f The Great Del() Cull of 2015 2015-07-09 02:48:34 -04:00
Fox-McCloud 6e87b96501 Pass 3 2015-07-08 01:34:53 -04:00
Fox-McCloud 9dc27ce126 Destroy Pass II 2015-07-07 22:26:28 -04:00
ZomgPonies 4d9baf9936 Merge pull request #1358 from Fox-McCloud/sarin-tabun
Sarin -> Tabun
2015-06-22 21:40:51 -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 a75a1165dc Sarin->Tabun 2015-06-20 15:21:24 -04:00
ZomgPonies ace7624975 Merge pull request #1301 from Fox-McCloud/storage-fixes
Can Hold Fixes
2015-06-13 04:30:33 -04:00
Fox-McCloud 481008b94e Can Hold Fixes 2015-06-13 04:11:14 -04:00
Fox-McCloud 2ad1c74457 Singularity Refactor 2015-06-10 20:04:28 -04:00
Fox-McCloud e4cbc5619e Classic Baton Refactor 2015-06-05 18:01:50 -04:00
ZomgPonies f65d374d1c Merge pull request #1249 from Fox-McCloud/AI-STATE-YOUR-LAWS
TG Ion Storm Event and Toy AI
2015-06-05 04:55:50 -04:00
Fox-McCloud b6ee1342e9 Redoes the Ion Storm Event and Toy AI 2015-06-04 00:06:16 -04:00
Fox-McCloud 41512b0252 Exam Room Tweaks 2015-06-02 23:17:17 -04:00
Fox-McCloud cd112b5364 Wolpin Fix+Monkey Tail Fix 2015-05-28 04:04:39 -04:00
FalseIncarnate a1cce51559 Merge Conflict Fix, Attempt 2 2015-05-27 01:07:19 -04:00
FalseIncarnate c385cb7f4f Botany Belt, Biogenerator Additions
Adds in the new Botany Belt, a belt designed for handling all sorts of
botany-related tools.

Adds the Botany Belt, Security Belt, Medical Belt, Janitor Belt, and
Bandolier to the Biogenerator's list of products.

Re-arranges the biogenerator's product listing to have a new "Belts"
section, dedicated to (you guessed it) belts.
- Moves the Utility (tool) into the Belts section, previously was in the
Leather section
- The new belt listings are also in this section.

All belts in the biogenerator have the same base cost of 300 points.
Increasing the efficiency of the machine will lower the costs
appropriately.

Adjusts some code related to the security belt so they won't magically
have a seclite in them when created via biogenerator.
- The belts in the sec lockers will still have their light
- The ERT belt no longer needs to clear contents during its New() proc
to remove the seclite.
2015-05-26 13:54:24 -04:00
ZomgPonies 264369bdfa issmall fixes and order of operations 2015-05-25 23:50:53 -04:00
ZomgPonies 1935a82afe 2/3 of port done 2015-05-25 19:48:13 -04:00
ZomgPonies f2d03e93c2 First 1/3 of port done. 2015-05-25 17:59:30 -04:00
Fox-McCloud 1b4c3f797d touch-ups 2015-05-24 01:35:52 -04:00
Fox-McCloud 791ebc0b7f New Race: Canine Race--Vulpkanin 2015-05-24 01:00:19 -04:00
Fox-McCloud 1c1eec3210 Tweaks and Fixes 2.0 2015-05-22 16:29:12 -04:00
ZomgPonies 2a0dcedd64 Couple of superhero fixes 2015-05-12 08:10:04 -04:00
Krausus 9d712fe623 Fixes pill bottles not grouping their contents 2015-05-11 09:11:11 -04:00
Krausus 65ce3e4c20 Fixes numbered contents grouping different things
Also fixes a runtime from the black powder fix. Whoops!
2015-05-11 08:53:14 -04:00
Fox-McCloud dbaf893fe6 Merge pull request #971 from Krausus/QuickDumping
Improved Dumping for Containers
2015-05-09 20:33:06 -04:00
Krausus 6ef0c00921 Adds missing canmove check 2015-05-09 07:41:21 -04:00
Krausus 5567c99a44 Adds drag-drop emptying to all containers
Also, fixes several missing checks and a facing mistake.
2015-05-09 02:25:38 -04:00
TheDZD 6515b10ccc Merge pull request #963 from ZomgPonies/superhero2
Superhero Overhaul Part 2: Magnetic Boogaloo
2015-05-08 16:55:59 -04:00
Krausus d8e6893e35 Improves dumping of "quick" containers
Allows all "quick" containers to be dumped into a disposal (click) or
onto a table (drag-drop).
2015-05-08 07:20:44 -04:00
Fox-McCloud b20104b360 Various Fixes and Tweaks 2015-05-07 23:31:39 -04:00
ZomgPonies d3a8caddbf Makes Owlman's belt reload every 60 seconds 2015-05-07 18:04:12 -04:00
Fox-McCloud 828e3c9927 Merge pull request #952 from ZomgPonies/superhero
Massive Superhero Update
2015-05-06 23:40:08 -04:00