Commit Graph

17684 Commits

Author SHA1 Message Date
Markolie cd088909b0 Minor bluespace artillery interface update 2015-08-30 22:49:05 +02:00
Fox-McCloud 16c17d3e8e Reduces Powernet Lag 2015-08-25 17:46:20 -04:00
Fox-McCloud 386ccd9717 Merge pull request #1844 from Markolie/cargonia
Cargo interface overhaul
2015-08-25 16:29:56 -04:00
TheDZD 9bcc8ae3d9 Merge pull request #1852 from Markolie/BRAINZZ
Bug fixes
2015-08-25 13:40:59 -04:00
Markolie 4cc6192783 Fix robotics console admin message 2015-08-25 19:31:38 +02:00
Markolie 77ed7b6d68 Brainloss fix 2015-08-25 19:18:19 +02:00
Markolie 960436945c NanoUI apostrophe fix 2015-08-25 19:18:02 +02:00
Mark van Alphen 3a4652fa6e Merge pull request #1845 from Spacemanspark/master
Allows xenos to use *flip.
2015-08-25 18:49:54 +02:00
Mark van Alphen a762491eb4 Merge pull request #1839 from Fox-McCloud/gutter
Gutter Language Update
2015-08-25 18:49:46 +02:00
KasparoVy 47aa5764a9 Fixes #1776, Vox Welding Helmet now Visible
Title explains the whole PR, for whatever reason it was looking for the sprite in the eyes section instead of the head section.

However, this turned up another issue. The mask's UP state is the exact same sprite as humans'-- which is just odd on Vox. I'll look further into that
2015-08-25 04:06:31 -04:00
Fox-McCloud 6b59b1f671 Merge pull request #1837 from tigercat2000/pools
pool logging
2015-08-25 00:37:39 -04:00
KasparoVy 06ead88f81 Makes Sinta'Unathi Easier to See
Made the text colour of the Unathi native language Sinta'Unathi 3 shades darker, a lot easier to tell apart from the standard radio.
2015-08-24 21:54:54 -04:00
Fox-McCloud 7c59d1ce69 Merge pull request #1836 from Markolie/power
Power monitor update
2015-08-24 21:25:06 -04:00
Markolie e0fff795f6 Fix disappearing cargo shuttle 2015-08-25 01:00:43 +02:00
Markolie be92097e3f Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into cargonia
Conflicts:
	code/game/supplyshuttle.dm
2015-08-25 00:46:32 +02:00
Fox-McCloud bcd3462142 Merge pull request #1835 from Markolie/turretaccess
Let players modify access of individual turrets
2015-08-24 16:55:36 -04:00
Fox-McCloud fd01044d16 Merge pull request #1833 from Markolie/T34-IPC
IPC organs are now printable, shuttle console ghost access
2015-08-24 16:55:05 -04:00
Fox-McCloud 16d14bb7ba Merge pull request #1830 from Markolie/spookyscareobservers
Update ghost following
2015-08-24 16:54:50 -04:00
Markolie 466c05d4e0 Let ghosts access autolathes/mech fabricators 2015-08-24 20:15:34 +02:00
Spacemanspark 51ea729d99 Allows xenos to use *flip.
Why wasn't this a thing before.
2015-08-24 12:57:33 -05:00
Markolie 1cd47ee4a3 Life reaction log update 2015-08-24 19:53:42 +02:00
Markolie 7a3696a114 Fix camera monitor not updating networks 2015-08-24 19:43:06 +02:00
Mark van Alphen b6a504c756 Merge pull request #1826 from FalseIncarnate/Sushi
Sushi Update
2015-08-24 19:28:50 +02:00
Markolie 6a6f09ed36 Cargo interface overhaul 2015-08-24 19:20:20 +02:00
Mark van Alphen b003de3e66 Merge pull request #1841 from Fox-McCloud/pants-fix
Pants Fix
2015-08-24 15:12:05 +02:00
Fox-McCloud ffdca82944 Pants Fix 2015-08-24 03:20:10 -04:00
Fox-McCloud 146ded3521 Gutter Language Update 2015-08-24 02:45:38 -04:00
Fox-McCloud d2396dc725 Emitter Fix 2015-08-24 02:26:50 -04:00
Tigercat2000 fc786199c5 pool logging 2015-08-23 19:42:01 -07:00
Markolie 93c52de1f9 Power monitor update 2015-08-23 23:58:38 +02:00
Markolie 13ef3af7d2 Let players modify access of individual turrets 2015-08-23 22:32:25 +02:00
Fox-McCloud 0bd980b6d1 Producible Emitter Boards 2015-08-23 15:54:51 -04:00
Markolie 1a16f807e0 Let robotics print IPC organs 2015-08-23 21:05:38 +02:00
Markolie e38b97fd68 Let ghosts access supply shuttle consoles 2015-08-23 21:00:48 +02:00
Markolie d8177969db IPC damage update 2015-08-23 20:13:50 +02:00
Markolie 6716c21a8f Update ghost following 2015-08-23 20:01:53 +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
DZD ca7d069ef9 Fixes
- Adds proper open panel sprite for recycler and seed extractor (fun
fact, the default icon state for t he seed extractor is "sextractor").
- Adds ability to rotatethe eat direction of the grinder, sadly there
are no sprites to match. (Somewhat copy-pasta'ed from particle
accelerator code)
- Stops the grinder from eating pthings if it is unanchored.
2015-08-22 21:13:38 -04:00
Fox-McCloud 5c0e21377c Merge pull request #1817 from Markolie/ipcrev
Re-add proper IPC reviving, let IPC's change their monitor
2015-08-22 16:07:33 -04:00
Fox-McCloud 24617a3421 Merge pull request #1814 from Spacemanspark/master
Adds the ability to teleport to people who activate pAI cards.
2015-08-22 16:07:17 -04:00
Fox-McCloud ea119a98df Merge pull request #1811 from Markolie/DENIED
Add option to reject adminhelps
2015-08-22 16:06:58 -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
Fox-McCloud 76d1493601 Merge pull request #1825 from Markolie/admins
Readmin fix, antag age update
2015-08-22 16:03:42 -04:00
Markolie e2246d40c5 Missing comma 2015-08-22 21:55:54 +02:00
Markolie 8ffea8f731 Readmin fix, antag age update 2015-08-22 21:53:51 +02:00
DZD 9f6cc85d7a Bug fixes
- Fixes not being able to put multiple items into a processor.
- Fixes monkey recycler design having the same ID as the smartfridge.
2015-08-22 14:02:41 -04:00
Tigercat2000 a1d4358af7 Make mysql save queries readable 2015-08-22 08:49:42 -07:00
Fox-McCloud 03e9b2fa1c Merge pull request #1802 from TheDZD/touch-spell
Wizard Touch Attacks and Staff Fixes
2015-08-21 23:01:02 -04:00
Aurorablade 2ad7168c6c changes disabilty to crimes 2015-08-21 20:08:32 -04:00