Commit Graph

6855 Commits

Author SHA1 Message Date
Arokha Sieyes
3f47fe64b6 Merge pull request #291 from VOREStation/dev-Ace
Replaces several mobs with vore versions
2016-06-03 23:57:39 -04:00
Spades
bd2dcfe956 Compile error fix. 2016-06-03 23:27:10 -04:00
Spades
aa2c74aef5 Replaced mobs with vore versions. 2016-06-03 22:57:51 -04:00
Arokha Sieyes
307e261e72 Synth gets hit by axe? Internal bleeding.
That'sa-no-good.
2016-06-03 21:14:46 -04:00
Arokha Sieyes
925b1b4a3e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
# Conflicts:
#	code/game/mecha/mech_fabricator.dm
2016-05-31 18:17:58 -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
Arokha Sieyes
54272da167 Merge pull request #245 from VOREStation/sink
Synchronize With Polaris
2016-05-31 01:35:04 -04:00
Leshana
eae29b9d69 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sink 2016-05-30 22:43:05 -04: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
Arokha Sieyes
6283dcdc86 Merge pull request #204 from Poojawa/vulparace
Vulparace
2016-05-30 02:43:08 -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
ff9b8a2a84 Make OOC_Notes easily and conveniently viewable when examining players. 2016-05-29 17:34:40 -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
Poojawa
423a010eba grammar tweak 2016-05-29 14:18:05 -05:00
Poojawa
e6368fb900 sync 2016-05-29 13:04:06 -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
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
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
df0135ac2b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall 2016-05-29 01:00:50 +01:00
Jon
21f898e047 First commit of manual port of BS12
#13042
and
#13086
2016-05-29 00:56:11 +01:00
EmperorJon
01b3182004 Merge pull request #1462 from Datraen/Xenobiology_2
Xenobio2
2016-05-28 21:32:18 +01:00
Yoshax
cd9fdd228b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall 2016-05-28 20:22:09 +01:00
Neerti
cbd4915420 Merge pull request #1592 from Anewbe/borg_changes
Various Borg Changes
2016-05-28 12:44:27 -04:00
Arokha Sieyes
ea6754597e Ports Bay's Robolimb Changes (#1779)
* Consolidates copypasta for repairing robolimbs

Also prevents self-repairing a limb you are using to hold the tool

* Fixes robot organs becoming undamagable after reaching cap

* Fixes repairing with cable not using any cable, repairing with weldingtool not doing eyecheck

* Removes ORGAN_ROBOT and ORGAN_ASSISTED flags, fixes #13123

* Fixes damage to robotic limbs not triggering organ processing

At the same time, robotic limbs with damage don't need to process.
However, it's much safer to explicitly have robot limbs return 0 from
needs_process() instead of not rechecking bad external organs.

* Build on HarpyEagle changes to apply to Polaris

Had to apply the change from flag to an enumeration.

* Removes unneeded file

* Fix bruisepacks, remove heart

Well, the unused bay version of the heart anyway

* Tweaks examine, reverts isSynthetic

Reverted that because Bay doesn't use it the same way. Also changed Examine to not list every robo-limb on non-FBPs in red, but left them listed as normal per Spookerton
2016-05-28 14:12:19 +01:00
Zuhayr
6281516826 Generalizes the accessory system to work for suits. 2016-05-27 23:01:47 +01:00
SinTwo
8bff04dac0 adds four new hair styles. 2016-05-27 13:43:03 -04:00
Poojawa
b97f528c3a Language tweak
Now follows what all the other races do
2016-05-26 19:28:38 -05:00
Arokha Sieyes
28ccc4f21c Yeah, that's a typo. 2016-05-26 16:21:11 -04:00
Arokha Sieyes
8e21e09d23 Yeah, that's a typo. 2016-05-26 16:17:23 -04:00
Poojawa
8b9f6f64d0 backups applied to files
Just to double ensure it's complaint.
2016-05-26 09:24:18 -05:00
Arokha Sieyes
76567bb7a2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync
# Conflicts:
#	code/modules/mob/living/carbon/human/whisper.dm

Whisper modified locally, and deleted upstream (in a change I made, so I know it's safe to remove).
2016-05-26 09:59:18 -04:00
Datraen
4448a6f469 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3
# Conflicts:
#	code/modules/mob/living/say.dm
2016-05-26 08:20:41 -04:00
Yoshax
77ee2215e7 Removes unused and unnecessary spam prevention 2016-05-26 04:24:18 +01:00
Datraen
6df5e33e36 Merge pull request #1745 from VOREStation/fixvision
Followup to blindness fix
2016-05-25 21:37:07 -04:00
PsiOmegaDelta
b31e6cf757 Fixes #12131.
Blindness/deafness now check the correct disability var (we have two for some reason, very practical).
2016-05-25 21:28:31 -04:00
Datraen
f0edb66f9b Merge pull request #1741 from VOREStation/sayupgrade
Say/Whisper Rewrite
2016-05-25 21:17:36 -04:00
Arokha Sieyes
487bb7cf96 Fixes ancient typo 2016-05-25 21:01:52 -04:00
Arokha Sieyes
1fed239264 Done w/ testing, block spam again. 2016-05-25 19:51:53 -04:00
Arokha Sieyes
9783848717 Don't forget dead people 2016-05-25 19:26:15 -04:00
Arokha Sieyes
6c04110805 Allows silicons to whisper (mostly used by borgs but I guess an AI could whisper into a radio). 2016-05-25 18:28:11 -04:00
Arokha Sieyes
4588498486 Worked Whisper into Say
It was annoying. And hard. But it's done.

For the most part anyway.
2016-05-25 16:59:47 -04:00
Datraen
349251e55f Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3
# Conflicts:
#	icons/mob/items/lefthand.dmi
#	icons/mob/items/righthand.dmi
#	icons/obj/weapons.dmi
2016-05-25 15:09:23 -04:00
Poojawa
a37fe84539 Additional void/rig suit sprites with tails!
Also, fixed wagging animation. minimum required number of animations is
10, starting from 0. so I just copied and renamed 9 more 1-9 to get
tails to work. hooray.
2016-05-25 10:48:04 -05:00
Datraen
79e22d58e5 Semi-final stage of Xenobio2 Initial Implementation
Adds UIs to Core Extractor, Slime Replicator
Adds Slimified Monkey Cubes as separate item type
Adds Docility Toxin
Replaces amutationtoxin references with docilitytoxin references
Adds resistances to simple_mob damage handling, to allow for simple mobs to have resistances to different kinds of damage
Moves a return to it's proper position to allow for hostile mobs to properly handle targets.
2016-05-25 03:50:23 -04:00
HarpyEagle
652e35024b Allows only one adverb when whispering 2016-05-25 00:48:57 -04:00
HarpyEagle
3347f97b5d Merge HarpyEagle remove speech problem flags 2016-05-25 00:48:02 -04:00
HarpyEagle
153cfaa5b4 Removes unused ninja speak 2016-05-25 00:46:14 -04:00