Commit Graph

4524 Commits

Author SHA1 Message Date
Fox-McCloud
7c59d1ce69 Merge pull request #1836 from Markolie/power
Power monitor update
2015-08-24 21:25:06 -04:00
Mark van Alphen
b6a504c756 Merge pull request #1826 from FalseIncarnate/Sushi
Sushi Update
2015-08-24 19:28:50 +02:00
Markolie
93c52de1f9 Power monitor update 2015-08-23 23:58:38 +02:00
Fox-McCloud
a53451c243 Merge pull request #1813 from TheDZD/muhcheens
Machine Upgrade Update
2015-08-23 00:35:18 -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
c65f47707b Merge pull request #1807 from Markolie/globalassetcache
Update start of game logging, add global asset cache
2015-08-22 16:06:04 -04:00
Markolie
aa9b5a6310 Implement /vg/'s global asset cache 2015-08-21 18:47:00 +02:00
DZD
afa978a002 Preserves sanity
Forgot to lower the PSHOOM_2 chance after hearing what the sound was,
whoops.
Some logging fixes too.
2015-08-20 21:38:00 -04:00
DZD
5ce49bb3b3 Machine Upgrade Update
- Partial port of tgstation/-tg-station#9813
2015-08-20 21:03:19 -04:00
TheDZD
639478ace5 Merge pull request #1777 from Markolie/malf
Malf AI update
2015-08-20 11:50:19 -04:00
TheDZD
0c31d41e78 Merge pull request #1792 from Markolie/nano
NanoUI pod tracker/exosuit console, uplink fix
2015-08-20 11:50:14 -04:00
Markolie
87570fc080 isNonCrewAntag() checks, key_name fixes 2015-08-20 17:25:55 +02:00
Markolie
286d2301f4 Replace disabling RCD's with exploding them 2015-08-20 01:29:23 +02:00
Markolie
b6a1e52e08 Hopefully fix uplink crashing 2015-08-19 22:22:51 +02:00
Mark van Alphen
b5afe7c459 Merge pull request #1787 from Spacemanspark/master
Griffin/ Owl toys actually make Griffin/ Owl noises.
2015-08-19 18:01:35 +02:00
TheDZD
2248b3eaa6 Merge pull request #1760 from Markolie/ipcmasterrace
IPC overhaul
2015-08-19 11:57:04 -04:00
Spacemanspark
5bdfbee22b Halves the sound of the owl and griffin toys.
Oh you no rike grorious sounds? Ding dong bannu!
2015-08-18 19:45:12 -05:00
Fox-McCloud
1f7bfe92be Merge pull request #1781 from Markolie/adminbus
Admin teleport update, further admin message fixes
2015-08-18 20:19:55 -04:00
Fox-McCloud
5be7884143 Merge pull request #1774 from Markolie/tcomms2
AI tracking update
2015-08-18 20:18:04 -04:00
Markolie
8086d61042 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into malf
Conflicts:
	code/game/objects/items/devices/aicard.dm
2015-08-18 20:24:10 +02:00
Markolie
80360fd8a9 Malf AI update 2015-08-18 20:22:38 +02:00
Markolie
8bede1db99 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into ipcmasterrace
Conflicts:
	code/modules/mob/living/simple_animal/friendly/fox.dm
	code/modules/organs/organ_alien.dm
2015-08-18 18:38:59 +02:00
Spacemanspark
e0e3681e75 Griffin/ Owl toys actually make Griffin/ Owl noises. 2015-08-18 11:05:20 -05:00
Krausus
f816b8672d Resolves merge conflicts
Conflicts:
	code/game/machinery/computer/communications.dm
2015-08-18 04:14:14 -04:00
Krausus
2090a66023 Fixes various runtimes
- Fixes flashers runtiming when flashing someone who lacks eyes.
- Fixes chem masters runtiming when told to make 0 pills.
- Fixes job objective completion runtiming when someone without a PDA
completes a job objective.
- Fixes the HUDs of clientless robots runtiming when trying to update.
- Fixes T-ray scanners causing runtimes when objects they're making
visible get deleted.
- Fixes mech bay recharge station turfs runtiming if destroyed while
missing a recharging port/console.
2015-08-18 02:53:23 -04:00
Markolie
4e8bb6d301 Admin teleport update, further admin message fixes 2015-08-18 00:54:25 +02:00
Fox-McCloud
333e7fe236 Merge pull request #1766 from Markolie/adminbus
Admin jump overhaul, add watchlist functionality, other admin updates
2015-08-17 18:10:38 -04:00
Markolie
8822cbba09 AI tracking update 2015-08-17 19:05:09 +02:00
Mark van Alphen
33631beaf8 Merge pull request #1740 from tigercat2000/underwear_refactor
-tg- underware overhaul
2015-08-17 17:37:50 +02:00
Mark van Alphen
4faf19d1bb Merge pull request #1761 from Fox-McCloud/genetics-tweak
Minor Genetics Balance
2015-08-17 16:16:53 +02:00
Markolie
6018e85128 Fix compile error 2015-08-17 01:03:34 +02:00
Markolie
381c3f0c92 Consistent bomb logging 2015-08-17 01:01:30 +02:00
Markolie
8af3c8c47a Final fixes/mech attack update 2015-08-17 00:32:50 +02:00
Markolie
5eee617063 Consolidate ?/FLW links under key_name_admin 2015-08-17 00:13:53 +02:00
Markolie
a397c730b5 Admin jump overhaul, add watchlist functionality, other admin updates 2015-08-16 23:28:02 +02:00
Mark van Alphen
6abb1f8730 Merge pull request #1754 from tigercat2000/log_to_dd
New proc to replace world.log <<, log_to_dd()
2015-08-16 17:49:00 +02:00
Markolie
d607739078 Final IPC fixes (hopefully) 2015-08-16 03:43:20 +02:00
Markolie
4a14a97b3b IPC overhaul part deux 2015-08-16 02:34:52 +02:00
Fox-McCloud
3fecd07249 Minor Genetics Balance 2015-08-15 18:19:51 -04:00
Markolie
e6408b96c2 IPC overhaul 2015-08-15 23:52:26 +02:00
Mark van Alphen
c31090584d Merge pull request #1755 from Krausus/BadPDANoteFix
Fixes Bad PDA Message Entries and Ringtone Consistency
2015-08-15 17:39:21 +02:00
Krausus
bc41922cbc Fixes bad PDA tnote entries and minor PDA bugs 2015-08-14 23:33:38 -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
Tigercat2000
ca921216fe New proc to replace world.log <<, log_to_dd()
This commit changes every 'world.log <<' message with a loggable proc-
log_to_dd().

This is adjustable in the config; If LOG_WORLD_OUTPUT is present, all
things sent to world.log will show up in the standard /data/logs/ logs.

These logs will contain the following (in order):
 Timestamp
 "DD_OUTPUT:"
 The message.

The config option for this, by default, is turned off.
2015-08-14 18:18:57 -07:00
Tigercat2000
748da30bb6 -tg- underware overhaul
This commit overhauls the underwear/undershirt system to -tg-'s text-based
version. No more magic numbers, just text states.

Note, this modifies the SQL Schema, and existing databases must be
modified by the following SQL:

ALTER TABLE server_db.characters
	CHANGE underwear underwear MEDIUMTEXT NOT NULL,
	CHANGE undershirt undershirt MEDIUMTEXT NOT NULL;
2015-08-13 17:45:52 -07: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
Fox-McCloud
1cce7c87be Merge pull request #1716 from Markolie/rndserver
Give syndi toolbox insulated gloves
2015-08-12 22:27:53 -04:00
Fox-McCloud
427a4437e8 Merge pull request #1713 from Markolie/master
Fixes
2015-08-12 17:37:22 -04:00
Fox-McCloud
e7a18159b7 Merge pull request #1711 from Markolie/icons
Add barber hud icon, add unique ID card for supervisors
2015-08-12 16:32:33 -04:00