Commit Graph
4623 Commits
Author SHA1 Message Date
Mark van Alphen 1539a4d1e8 Merge pull request #2041 from Fox-McCloud/backpacks
Backpack Storage Rework
2015-09-15 06:58:44 +02:00
Fox-McCloud 3e0a6d286d tweaks 2015-09-15 00:12:41 -04:00
Fox-McCloud 1979043d84 Cluster Grenade Cleanup 2015-09-15 00:04:57 -04:00
Markolie 90f722d752 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom
Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
	icons/mob/back.dmi
2015-09-15 04:18:27 +02: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
Fox-McCloud 1e1c667ad5 Backpack Storage Rework 2015-09-13 23:22:09 -04:00
Markolie 2cf27f9255 Get rid of two obsolete overrides 2015-09-13 23:03:16 +02:00
Markolie ca6c7d10ba In hand sprite overhaul 2015-09-13 22:44:18 +02:00
Markolie aaeac981b9 Temperature gun update 2015-09-13 21:05:23 +02:00
Fox-McCloud 25c35343dc materials-consitency 2015-09-12 16:22:39 -04: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
Mark van Alphen 69139c1bef Merge pull request #1993 from Fox-McCloud/rad-laser-fix
Rad Laser Fix
2015-09-10 01:14:38 +02: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
Tigercat2000 ee32c0a35a Merge branch 'master' into intent_define
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
2015-09-08 04:43:13 -07:00
Tigercat2000 be92665871 Replace magic intent words with defines, grab fixes
This commit does the following:
 - Replaces all instances of magic intent words, like "harm" and
 "help" with defines, I_HELP, I_DISARM, I_GRAB, I_HARM

 - Fixes a few manual grab instances left over in attack_alien, they
 will now used grabbedby()
2015-09-07 11:51:00 -07:00
Regen c4e0f4ad3b Lockbox update
Makes it so the mech weapons actually do spawn in lockboxes
Also adds a large lockbox to fit the mech weapons (No sprite as of yet)
2015-09-06 22:55:22 +02:00
Fox-McCloud 2214a8b455 R&D Update: Implants and Autolathes 2015-09-05 23:57:22 -04:00
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 71493c9d3f butchers knife oops 2015-09-04 18:37:47 -04:00
Fox-McCloud 46ce41fbc8 unused var axing 2015-09-04 18:04:34 -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
Fox-McCloud 9695509908 Merge pull request #1919 from tigercat2000/funlittletgthings
Progress bars
2015-09-01 16:45:10 -04:00
Fox-McCloud d829e7003a Merge pull request #1913 from Markolie/lawmanager
Port Bay's silicon law manager
2015-09-01 16:41:55 -04:00
Fox-McCloud 2b6e574587 Merge pull request #1891 from Markolie/eyes
Mechanicals eyes update
2015-09-01 16:41:42 -04:00
Markolie 2f96d6e3a6 Update comment 2015-09-01 19:16:11 +02:00
Markolie 3898ba87a7 Robotic eyes will not protect your from welding/the supermatter 2015-09-01 19:13:17 +02: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 182e546d6a Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixes
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-08-30 00:38:03 +02:00
Markolie 134d2116c6 Makes mechanical eyes protect you 2015-08-29 18:38:26 +02:00
Markolie 59632e1897 Add new variable instead of using blocked 2015-08-29 03:25:35 +02:00
Markolie de03689105 Fix DNA injector radiation damage 2015-08-29 01:28:47 +02:00
TheDZD a00b878779 Merge pull request #1856 from Fox-McCloud/rnd-lockboxes
R&D Lockbox Origintech
2015-08-26 22:05:56 -04:00
Markolie 27f75d7b38 Fix ghosts triggering glass 2015-08-27 03:25:32 +02:00
Fox-McCloud 110abbda59 R&D Lockbox Origintech 2015-08-25 21:24:09 -04:00
Mark van Alphen b6a504c756 Merge pull request #1826 from FalseIncarnate/Sushi
Sushi Update
2015-08-24 19:28:50 +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
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