Commit Graph

5222 Commits

Author SHA1 Message Date
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
77ed7b6d68 Brainloss fix 2015-08-25 19:18:19 +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
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
16d14bb7ba Merge pull request #1830 from Markolie/spookyscareobservers
Update ghost following
2015-08-24 16:54:50 -04:00
Spacemanspark
51ea729d99 Allows xenos to use *flip.
Why wasn't this a thing before.
2015-08-24 12:57:33 -05: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
Fox-McCloud
146ded3521 Gutter Language Update 2015-08-24 02:45:38 -04: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
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
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
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
609c850d18 Re-add proper IPC reviving, let IPC's change their monitor 2015-08-21 19:52:03 +02:00
Markolie
aa9b5a6310 Implement /vg/'s global asset cache 2015-08-21 18:47:00 +02:00
Spacemanspark
90b61adb23 Adds the ability to teleport to people who activate pAI cards.
We can do the same with posibrains, why not pAI's?
2015-08-20 22:34:50 -05:00
Markolie
eb2d2b6df9 Another dsay fix 2015-08-20 21:13:17 +02:00
Markolie
d556608225 dsay fix 2015-08-20 20:58:54 +02:00
TheDZD
639478ace5 Merge pull request #1777 from Markolie/malf
Malf AI update
2015-08-20 11:50:19 -04:00
Markolie
1e5d0ef4c8 Fix compile 2015-08-20 17:31:49 +02:00
Markolie
87570fc080 isNonCrewAntag() checks, key_name fixes 2015-08-20 17:25:55 +02:00
Fox-McCloud
f635d9c054 Merge pull request #1778 from Markolie/events
Revenant update, event weight tweaks
2015-08-19 17:04:14 -04:00
TheDZD
2248b3eaa6 Merge pull request #1760 from Markolie/ipcmasterrace
IPC overhaul
2015-08-19 11:57:04 -04: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
4b3b9f57b0 Remove NO_POISON from golem/shadow 2015-08-19 01:30:35 +02:00
Markolie
473dcbead5 Remove IPC toxin immunity for now 2015-08-18 21:54:58 +02:00
Markolie
6576c02a71 More revenant updates 2015-08-18 21:06:48 +02:00
Markolie
bbc249172c Fix see_override, add uses to lockdown 2015-08-18 20:56:21 +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
Markolie
a8f8fb160a Revenant update 2015-08-18 18:29:45 +02:00
Markolie
6bb7372ace Logging/ghost messages for various whispers 2015-08-18 18:15:49 +02:00
Krausus
f816b8672d Resolves merge conflicts
Conflicts:
	code/game/machinery/computer/communications.dm
2015-08-18 04:14:14 -04:00
Krausus
a1cc629f6e Gives constructs universal_speak
This allows them to actually communicate with humans, rather than just
causing runtimes.
2015-08-18 03:38:47 -04:00
Krausus
621341317d Fixes AI power supplies runtiming after deletion 2015-08-18 01:43:45 -04:00
Krausus
c3ec8d63f8 Fixes AI late-joins not deleting the inactive core 2015-08-18 01:34:15 -04:00
Fox-McCloud
e618f79418 Merge pull request #1768 from Markolie/diona
Turn diona nymphs into simple animals
2015-08-17 21:34:46 -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
Fox-McCloud
6d9e64b42b Merge pull request #1775 from Markolie/cult
Cult loyalty implant fix, other fixes
2015-08-17 17:12:46 -04:00
Markolie
a15097f6fb Revenant update, event weight tweaks 2015-08-17 22:08:25 +02:00
Markolie
c91e698e24 Fix shuttle call sanitization 2015-08-17 21:20:00 +02:00
Markolie
487b73049f Sanity check 2015-08-17 21:08:55 +02:00
Markolie
c688fd1c52 Add resting animations for syndifox, syndicat, cats and dionas 2015-08-17 21:07:19 +02:00