Commit Graph

4563 Commits

Author SHA1 Message Date
Tigercat2000
54d2fa8c84 Misc. -tg- xeno tweaks
This commit does the following:
 - Allows xenomorphs to mine through mineral turfs (the asteroid)
 - Changes weed spreading to use atmos procs; It will spread like gas, not
   just checking "oh, dense object, no pass for me!"
  - No, this doesn't mean it will spread infinitely or quicker, just
    changes where it can spread.
2015-09-05 08:34:08 -07:00
Fox-McCloud
6f53ca4b4e Merge pull request #1953 from KasparoVy/master
Adds Vox Security Uniforms + Warden/HoS Corporate Uni. to Their Lockers
2015-09-05 05:55:50 -04:00
Fox-McCloud
e8f486f397 Merge pull request #1946 from Markolie/intercom
Remove radio free range
2015-09-04 22:47:24 -04:00
TheDZD
07acac3bfd Merge pull request #1944 from Fox-McCloud/cult-tweaks
Cult Tweaks
2015-09-04 22:01:11 -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
Markolie
281f5a9640 Intercom update 2015-09-05 01:38:34 +02:00
KasparoVy
f3ba11fbda Adds Warden Corporate and HoS Corporate Uniforms to Appropriate Lockers 2015-09-04 15:49:27 -04:00
Markolie
26d0ad3071 Radio access update 2015-09-04 19:29:56 +02:00
Markolie
3a3457de36 Port Bay's intercom overhaul 2015-09-03 21:21:20 +02:00
Fox-McCloud
9b8342897e Cult Tweaks 2015-09-02 21:08:08 -04:00
Fox-McCloud
e2347866a8 Merge pull request #1926 from Markolie/lordoftheflies
Make lockers use forceMove()
2015-09-02 15:58:09 -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
Markolie
8d7bd64a00 Make lockers use forceMove() 2015-09-01 18:49:19 +02:00
Fox-McCloud
0b3f784acc Merge pull request #1912 from tigercat2000/xenies
Remove arbitrary w_class restriction for xenos
2015-08-31 21:32:31 -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
Fox-McCloud
b683cfa0c5 Merge pull request #1898 from Markolie/wheelchair
Allow for the construction of wheel chairs
2015-08-30 19:47:25 -04:00
Tigercat2000
b1f0fc4560 Remove arbitrary w_class restriction for xenos 2015-08-30 15:32:51 -07:00
Markolie
29d91a7995 Allow for the construction of wheel chairs 2015-08-30 01:08:40 +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
Fox-McCloud
67f1b00291 Transit Tube Update 2015-08-29 18:22:29 -04:00
Mark van Alphen
7aabf8b79e Merge pull request #1873 from tigercat2000/centcomm
Centcom tweaks
2015-08-29 19:03:59 +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
Fox-McCloud
d70b644621 Merge pull request #1876 from Markolie/magpulse
Give engineering borgs a permanent magboots effect
2015-08-28 18:42:23 -04:00
Fox-McCloud
8034b35881 Merge pull request #1869 from Markolie/fuckingglass
Ghost interaction update, voice changer fix, man up global confirmation
2015-08-28 14:36:16 -04:00
Markolie
f8e462b1ee Give engineering borgs magboots 2015-08-27 23:59:47 +02:00
Tigercat2000
a54be7c47b Centcomm Mods
Moved the kitchen and dorms to be sticking out less
Added escape bathrooms
2015-08-27 12:59:37 -07:00
Markolie
0e0cc0af50 Ghost interaction update, voice changer fix, man up global confirmation 2015-08-27 15:33:33 +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
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
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
TheDZD
0c31d41e78 Merge pull request #1792 from Markolie/nano
NanoUI pod tracker/exosuit console, uplink fix
2015-08-20 11:50:14 -04:00