Commit Graph

16690 Commits

Author SHA1 Message Date
Arokha Sieyes
bf3b350ee3 Readd shrink ray, fix material requirement on ex drill 2016-05-31 18:10:30 -04:00
Mechoid
7bcd041e09 Fixes overlay issue with ghosts when choosing sprites, and adds more sprites to choose from from popular demand. 2016-05-31 14:30:17 -07:00
Datraen
36d9cee0f7 Merge pull request #1806 from VOREStation/limbprinter
Make FBPs Constructable
2016-05-31 15:50:32 -04:00
Datraen
c75512aa75 Xenobio2 Update #3 (#1832)
* Adds growth inspection to the trait scanner, lowers mutation and growth levels.

* Adds NutriMaxes to Xenobiology, for feeding the slimes.

* Fixes a typo
2016-05-31 18:30:52 +01:00
Broseph Stylin
4518e22be2 Small update to double beds. (#1828)
* Corrects a typo because I'm dumb.

* Adds double bed recipe to appropriate materials.
2016-05-31 15:08:57 +01:00
Datraen
caac4c5838 Randomized Plant Update (#1805)
* Plants now use a ban list instead of an approved.

This means that most reagents can be synthesized by plants.

Also added a name generator for strange seeds, based off of a bit of
lipsum and a bit of various plant genus and descriptors.

# Conflicts:
#	code/modules/hydroponics/seed.dm

* Removes # sign
2016-05-31 15:08:42 +01:00
Poojawa
f3208c2a5b Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-05-31 05:38:05 -05:00
Mark9013100
d7624b2b15 Adds a few more accessories 2016-05-31 06:16:05 -04:00
Arokha Sieyes
54272da167 Merge pull request #245 from VOREStation/sink
Synchronize With Polaris
2016-05-31 01:35:04 -04:00
Leshana
3fbd3c8020 Merge remote-tracking branch 'tmp/Xenobio2Update2' into sink 2016-05-31 00:23:44 -04:00
Datraen
c1c3110496 Xenobio2 Update
Adds the trait scanner, which I had thought was previously added.
Fixes the smartfridge not believing that it had the cores in it's inventory.
Fixes an inverted check.
2016-05-30 23:44:53 -04:00
Leshana
eae29b9d69 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sink 2016-05-30 22:43:05 -04:00
Mark9013100
9aecdce655 Adds more ties to loadout, strangulation not included 2016-05-30 17:00:31 -04:00
Cameron653
d4c16be569 Adds in a language implant. 2016-05-30 16:59:57 -04:00
Spades
26c759c7ad Fixes #1813 (#1815) 2016-05-30 19:57:06 +01:00
EmperorJon
741706e9e3 Underwear + setup merges (#1812)
* Manually merges 12595 and 12461.

* Moron Jon 2: Moron Boogaloo

* Makes Yosh happier
2016-05-30 19:19:45 +01:00
Poojawa
ffda6862b1 Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-05-30 09:34:02 -05:00
Poojawa
9db78484d0 Merge branch 'refs/heads/vulparace' 2016-05-30 09:33:53 -05:00
Arokha Sieyes
6283dcdc86 Merge pull request #204 from Poojawa/vulparace
Vulparace
2016-05-30 02:43:08 -04:00
Arokha Sieyes
9f841e55c9 Merge pull request #247 from VOREStation/dev-AceMapping
Gaggle of map tweaks
2016-05-30 02:41:34 -04:00
Arokha Sieyes
636bcd8745 Sad that I have to do this. 2016-05-30 02:36:58 -04:00
Arokha Sieyes
2186afb094 Dem tags doe.
Closed a </span> tag I forgot.
2016-05-30 02:22:33 -04:00
Arokha Sieyes
05f8a69821 Make FBPs Constructable
Print 'em out, slap an MMI or Posibrain in. They come from a new machine, the Prosthetics Fabricator. You can order license discs from cargo to print the proprietary limbs. Making FBPs requires a bit of research as well, otherwise you only get arms/legs. Also requires a bit of plasteel to make the critical parts. Mostly just need every limb, plus eyes. Torso comes with the snowflakey FBP battery.

Also adds an FBP 'self-diagnostics' verb. More vague than an analyzer.

**This adds a machine that needs to be placed on the map. "/obj/machinery/pros_fabricator"**

Personally, I would replace the right-side exosuit fab with it. I can add this to my PR but I'm unsure how you guys feel about non-devs submitting map changes.
2016-05-30 02:13:55 -04:00
Leshana
41afe2434a Fixed unmatched closing span tags. 2016-05-30 01:41:10 -04:00
Spades
c96e66a144 Minor tweaks, Skipjack can now dock at station
Tried editing communicator.dm and shuttle_controller.dm as their own _vr
files but this might cause problems, I'm not sure.
2016-05-29 18:04:46 -04:00
Datraen
eb0629add2 Merges new for MMI/Posibrains, fixes runtimes from posibrains. 2016-05-29 17:57:16 -04:00
Anewbe
5f02cb745d Fixes indentation error 2016-05-29 16:54:17 -05:00
Anewbe
0cee486bcf Merge branch 'master' of https://github.com/PolarisSS13/Polaris into more_hostile_mobs 2016-05-29 16:36:11 -05:00
Leshana
ff9b8a2a84 Make OOC_Notes easily and conveniently viewable when examining players. 2016-05-29 17:34:40 -04:00
Datraen
0af225f29a Fixes #1795
Prevents the MMI from actually spawning inside of the mannequin, as it is not needed and the mob only exists in nullspace to generate images.
This prevents the MMI from calling Life() and generating runtimes, as well as preventing it from adding to the mob lists.
2016-05-29 17:12:57 -04:00
Anewbe
8d470f6989 Adds cult variants of the strong mobs 2016-05-29 16:07:19 -05:00
Anewbe
9b7c17a883 Adds stronger variants of cultmobs for shenanigans. 2016-05-29 15:57:31 -05:00
Leshana
188dbfab59 Merge pull request #244 from Arokha/struggle
Fix struggle sounds
2016-05-29 16:27:48 -04:00
Leshana
e004a8bfc0 Merge remote-tracking branch 'polaris/master' into sink
# Conflicts:
#	code/_onclick/item_attack.dm
#	code/modules/client/preferences.dm
#	code/modules/mob/living/carbon/human/examine.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/new_player/preferences_setup.dm
#	nano/images/nanomap_z1.png
#	vorestation.dme
2016-05-29 16:22:07 -04:00
Arokha Sieyes
29bad6b935 Fix belly sounds. 2016-05-29 15:45:06 -04:00
Poojawa
423a010eba grammar tweak 2016-05-29 14:18:05 -05:00
Poojawa
24944be09a why am I still awake
seriously, how did I miss this?
2016-05-29 13:10:57 -05:00
Poojawa
757dc91ced oops 2016-05-29 13:07:03 -05:00
Poojawa
e6368fb900 sync 2016-05-29 13:04:06 -05:00
Poojawa
b8447c4b03 sync 2016-05-29 12:25:40 -05:00
EmperorJon
5a545854a4 Underwear Datums (#1794)
* One more step to bringing our preferences/setup stuff in line with Bay.

* Whoopsy

* Jon is a moron, more at 11.
2016-05-29 17:29:36 +01:00
Yoshax
288ae3d274 Merge pull request #1796 from VOREStation/realisticfbp
The Terminator Update
2016-05-29 15:56:22 +01:00
KasparoVy
d5aabda108 Ports Models for Cybernetic Limb Manufacturers + More Monitor-head Wallpapers (#1775)
* Ports Models for Cybernetic Limb Manufacturers + More Monitor-head Wallpapers

As requested!

* Modified as requested.

* Different Names
2016-05-29 15:09:56 +01:00
Arokha Sieyes
34d323e57f The Terminator Update
This updates synthetic limbs to make more sense. It tweaks what you can 'see' when examining people. If someone has a robotic leg but is wearing pants, how would you know that? If someone has a burn on their arm, but their jumpsuit sleeves down, how would you know that? If someone has a replacement Vey-Med arm, how would you know it's robotic? It also treats examining FBPs more 'realistically'. If they are covered except for their head, it doesn't matter if their whole body is Bishop robotic. If their head is Vey-Med and that's all you can see, they just look human to you.

So FBP manufacturers can have a 'lifelike' var set. Vey-Med has this. This makes the limbs not show obviously non-organic damage (dents) until they are more damaged and start showing wires/metal. Attempts to treat these limbs with medical stuff results in a different message. Manufacturers can also set individual blood colors. Vey-Med blood is now white, ala Bishop from Aliens.

isSynthetic proc = Is the mob actually synthetic, as in, mechanically for breathing/tox purposes?
looksSynthetic proc = Does the mob display outward signs of being synthetic? Based on head and torso and what's revealed.

Other fixes:
You can no longer attach limbs to non-existent parents. You can't give somone a foot on a leg that doesn't exist.
You can't attach fleshy limbs to robotic ones. BODIES DO NOT WORK THAT WAY.
'Synthetic' var on humans points to manufacturer if you need to grab it quickly. isSynthetic returns this as well.
Robolimb count (and thus overheating speed) updates whenever your limbs change.
Lifelike FBPs do not show a 'system offline glyph'.
isSynthetic and looksSynthetic moved to human_helpers becasue they were defined on human in mob_helpers
Nanopaste correctly repairs limbs using the new procs (both burn and brute, making it an expensive welder+wire)
2016-05-29 02:37:13 -04:00
Jon
ba529fabed Fixes #1790 2016-05-29 04:15:22 +01:00
Datraen
ae3157d5c3 Merge pull request #1787 from EmperorJon/28_May_Port_setup_changes
Manual port of BS12 setup changes
2016-05-28 22:59:56 -04:00
Yoshax
722c099847 Merge pull request #1788 from Datraen/Xenobio2_Tweaks
Xenobio2 tweaks
2016-05-29 03:56:39 +01:00
Yoshax
5d3dbb8b6f Fixes chromatic slime laser reflection and adjusts a span class 2016-05-29 01:33:48 +01:00
Datraen
1e6ecb0c88 Xenobio2 Tweaks
Adds nameVar to products, sets it to products/xenos when they are created from the proper machinery.
Adds the manual injector to the machinery that can take beakers, preventing them from spilling onto the machine when inserted.
Tweaks the NanoUI to properly display percent mutated, adds a proper check to see if it is not a xeno occupant.
2016-05-28 20:06:51 -04:00
Yoshax
df0135ac2b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall 2016-05-29 01:00:50 +01:00