Commit Graph

508 Commits

Author SHA1 Message Date
Tigercat2000
c562680098 Merge remote-tracking branch 'origin/master' into bay_examine
# Conflicts:
#	code/game/objects/structures/displaycase.dm
2015-09-15 14:08:36 -07: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
Markolie
ca6c7d10ba In hand sprite overhaul 2015-09-13 22:44:18 +02:00
Markolie
d5a3fb57ea Add cooldown to pAI card/drone reactivations 2015-09-11 06:51:14 +02:00
Mark van Alphen
84b42c5491 Merge pull request #1986 from Fox-McCloud/nuke-and-tator
Nuke Ops and Traitor Update+Balance
2015-09-10 02:24:32 +02:00
Fox-McCloud
5b160f78f4 topic-fixup 2015-09-09 17:49:27 -04:00
Fox-McCloud
d70c166109 Rad Laser Fix 2015-09-09 17:00:53 -04:00
Fox-McCloud
71f6b312d8 tweak 2015-09-08 22:01:05 -04:00
Fox-McCloud
1c6c733a52 Nuke Ops and Traitor Update+Balance 2015-09-08 19:38:30 -04:00
Fox-McCloud
95cea49702 oops 2015-09-04 22:56:52 -04:00
Fox-McCloud
64b2bb3784 Merge remote-tracking branch 'upstream/master' into material-datums 2015-09-04 22:53:20 -04:00
Markolie
94bb785282 Final intercom fixes 2015-09-05 02:42:19 +02:00
Markolie
368124a7e6 Main map intercom updates 2015-09-05 02:27:20 +02:00
Fox-McCloud
ea6bfdf758 upgradeable recycler 2015-09-04 19:41:42 -04:00
Markolie
281f5a9640 Intercom update 2015-09-05 01:38:34 +02:00
Markolie
26d0ad3071 Radio access update 2015-09-04 19:29:56 +02:00
Fox-McCloud
a019934e9e Pass I 2015-09-04 05:18:48 -04:00
Markolie
3a3457de36 Port Bay's intercom overhaul 2015-09-03 21:21:20 +02:00
Fox-McCloud
9695509908 Merge pull request #1919 from tigercat2000/funlittletgthings
Progress bars
2015-09-01 16:45:10 -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
Markolie
b999ca32b8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lawmanager
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-08-31 02:23:24 +02:00
Markolie
5dc034719d Port Bay's silicon law manager 2015-08-31 02:18:49 +02:00
Markolie
0e0cc0af50 Ghost interaction update, voice changer fix, man up global confirmation 2015-08-27 15:33:33 +02:00
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
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
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
b6a1e52e08 Hopefully fix uplink crashing 2015-08-19 22:22:51 +02: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
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
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
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
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
4a14a97b3b IPC overhaul part deux 2015-08-16 02:34:52 +02:00
Markolie
e6408b96c2 IPC overhaul 2015-08-15 23:52:26 +02:00
Krausus
bc41922cbc Fixes bad PDA tnote entries and minor PDA bugs 2015-08-14 23:33:38 -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
TheDZD
56af11019a Merge pull request #1708 from Markolie/caching
Caching
2015-08-11 17:42:57 -04:00
Markolie
7101ccde02 Further caching updates 2015-08-11 18:28:45 +02:00
Markolie
4af432dd2d Fix incorrect power monitor variable name 2015-08-11 16:03:21 +02:00