Commit Graph

587 Commits

Author SHA1 Message Date
Markolie
d40cfe582e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into swordnborg
Conflicts:
	icons/obj/surgery.dmi
2015-10-01 04:32:10 +02:00
Markolie
d18b18b5b4 Syndicate borg update, add medical syndicate borg, energy sword refactor 2015-10-01 04:21:24 +02:00
Tigercat2000
b5218bfb5c Fixes monkey cubes, more or less
They will now unEquip() if they are in a mob, therefore clearing the hand
ref to them.
2015-09-30 09:34:11 -07:00
Markolie
d4e5149389 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fluff
Conflicts:
	code/modules/mob/living/silicon/robot/drone/drone.dm
2015-09-26 05:12:52 +02:00
Tigercat2000
4b6a3ddcb6 -tg- SpaceMove update
This commit updates the spacemove system to -tg-'s; All objects now drift
in space, not just mobs. A few hardcoded space checks have been replaced
with has_gravity(); So it applies to zero-G as well as space.

Spacepods no longer drift, because their snowflakey shitcode just doesn't
work. So they just move.
2015-09-25 15:53:59 -07:00
Markolie
e96103a02b Fluff item clean-up 2015-09-25 04:31:30 +02:00
Mark van Alphen
16090e6a1f Merge pull request #2129 from Fox-McCloud/chem-proc-change
Changes a Chemistry Transfer Proc
2015-09-23 19:50:20 +02:00
Fox-McCloud
71001cc5ea Changes a Chemistry Transfer Proc 2015-09-22 05:56:49 -04:00
Markolie
3c7413dc65 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into pet
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-09-22 00:17:30 +02:00
Markolie
f7234374b5 Update armour penetration checks 2015-09-21 22:54:26 +02:00
Markolie
ea305d3ffa Saber SMG update, add armour piercing variable 2015-09-21 22:50:07 +02:00
Mark van Alphen
3510e6c863 Merge pull request #2104 from Fox-McCloud/spray-bottle-nerf
Spray Bottle Nerf
2015-09-21 02:10:43 +02:00
Fox-McCloud
be4607d70d Spray Bottle Nerf 2015-09-19 09:09:01 -04:00
Fox-McCloud
47d14c3b7e Chemistry: Patch Balance 2015-09-18 22:33:40 -04:00
Fox-McCloud
bef21a964d Merge pull request #2068 from Markolie/lawstate
Welding tool refactor, in-hand updates
2015-09-16 19:07:29 -04:00
Mark van Alphen
d708ee8d84 Merge pull request #2058 from Fox-McCloud/cluster-grenade-cleanup
Cluster Grenade Cleanup
2015-09-16 20:22:38 +02:00
Fox-McCloud
cf21717a76 Merge pull request #2055 from Markolie/lesser
Switch spray admin messages to attack messages
2015-09-15 22:04:21 -04:00
Markolie
611cb16df8 Add torch, more in-hand fixes 2015-09-16 03:22:01 +02:00
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
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
Markolie
fae3e78270 Switch spray admin messages to attack messages 2015-09-15 04:01:19 +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
3ce1e989ce Materials Consistency Fix/Update 2015-09-13 17:49:36 -04:00
Markolie
ca6c7d10ba In hand sprite overhaul 2015-09-13 22:44:18 +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
1c6c733a52 Nuke Ops and Traitor Update+Balance 2015-09-08 19:38:30 -04: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
Fox-McCloud
ea6bfdf758 upgradeable recycler 2015-09-04 19:41:42 -04:00
Fox-McCloud
a019934e9e Pass I 2015-09-04 05:18:48 -04:00
Markolie
829441bd01 Fixes https://github.com/ParadiseSS13/Paradise/issues/1930 2015-09-03 22:20:26 +02:00
FalseIncarnate
e8fa1599c6 Assorted Fixes
Fixes toothless shark item using the placeholder fish sprite.

Fixes shark teeth being invisible
- Also slightly randomizes their position like with normal glass shards

Fixes Tobiko Sushi incorrectly being named Ikura Sushi and having an
invisible sprite

Fixes runtimes due to protein being misspelled as "protien" in 4 sushi
defines.

Fixes #1884
- This was caused by diona nymphs lacking the CANPUSH status_flag, which
is required to pass grab checks.
- Gave diona nymphs the PASSMOB pass_flag, should avoid them pushing
people everywhere, and also prevent them from being trapped by other
nymphs/people/Ian.
- CANPUSH and PASSMOB are both flags possessed by mice, so this change
effectively makes the nymph mobs closer to mice than monkeys.
2015-08-30 01:37:11 -04:00
Fox-McCloud
c1f7808d9e So Salty 2015-08-25 21:52:44 -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
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
c10b62959b Re-add IPC syringing 2015-08-18 18:36:05 +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
Markolie
e6408b96c2 IPC overhaul 2015-08-15 23:52:26 +02:00
Fox-McCloud
427a4437e8 Merge pull request #1713 from Markolie/master
Fixes
2015-08-12 17:37:22 -04:00
Mark van Alphen
bc5f7ccb0c Merge pull request #1706 from Alex6511/master
Makes lethal injection syringes far more deadly
2015-08-12 18:24:46 +02:00
Markolie
362a817d79 Runtime and bug fixes 2015-08-12 18:20:53 +02:00
Alex6511
b19d15b9cb Adjusted the drugs more. 2015-08-10 23:33:22 -04:00
Alex6511
f704e200b7 Update syringes.dm 2015-08-10 23:00:50 -04:00
Alex6511
5f5167ccfa Makes lethal injection syringes more deadly 2015-08-10 22:58:43 -04:00
Fox-McCloud
0d810b5012 typo 2015-08-10 12:18:00 -04:00
Fox-McCloud
7ac65025bd Adds Pistachio Snacks 2015-08-10 01:56:50 -04:00
Markolie
dd067f582a Update smartfridge types, merge branch 'master' of https://github.com/ParadiseSS13/Paradise into powernet
Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm
2015-08-01 19:35:39 +02:00
Markolie
08f67c7881 Smartfridge update 2015-08-01 00:18:00 +02:00
Fox-McCloud
30f5465d47 Merge pull request #1593 from FalseIncarnate/master
Candy Fixes, Juicer Fix
2015-07-31 12:58:14 -04:00