Commit Graph

6879 Commits

Author SHA1 Message Date
Cameron653
78eef5121f Uploading this so I can move and work elsewhere. 2016-06-10 22:12:44 -04:00
Cameron653
3b451175ac This mostly works.
Can't use it while KO'd or dead, however. Fallback in case of error.
2016-06-10 21:02:30 -04:00
Cameron653
1a71b0ea53 Merge remote-tracking branch 'refs/remotes/VOREStation/master' 2016-06-09 20:28:21 -04:00
Cameron653
0344114872 Makes weight not be "they are" anymore. 2016-06-09 15:34:12 -04:00
Cameron653
49ebf37c72 Final fix 2016-06-09 02:48:54 -04:00
Cameron653
8172737fc9 Byond and travis hate .1 2016-06-09 02:44:23 -04:00
Cameron653
91a77e5bb9 Severely nerfs prometheans heal rate 2016-06-09 01:51:45 -04:00
Cameron653
f9ac5f3bfa Fiiixesss 2016-06-09 01:31:49 -04:00
Cameron653
816255fed4 Allows prometheans to actually change into all species 2016-06-09 01:27:13 -04:00
Spades
4b9eeec946 Merge pull request #320 from VOREStation/synthgurgles
Tweaks digestion code
2016-06-08 13:36:15 -04:00
Arokha Sieyes
eb6f979fc0 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
# Conflicts:
#	vorestation.dme
2016-06-07 18:37:47 -04:00
Arokha Sieyes
c625a7515e Tweaks digestion code
Makes synths digest more gracefully and actually preserves MMIs like intended
2016-06-07 18:20:52 -04:00
Cameron653
c5d3883ef5 Create prometheans_vr.dm 2016-06-07 15:08:17 -04:00
Datraen
fa74226e99 Merge pull request #1844 from SpadesNeil/GunsGunsGuns
Guns, Guns, Guns (Now in a PR less stupid)
2016-06-05 13:25:26 -04:00
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
15fdb5eb1b Synth gets hit by axe? Internal bleeding.
That'sa-no-good.
2016-06-03 21:18:24 -04:00
Arokha Sieyes
307e261e72 Synth gets hit by axe? Internal bleeding.
That'sa-no-good.
2016-06-03 21:14:46 -04:00
Spades
736c8c132c Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns 2016-06-02 13:01:45 -04:00
Yoshax
f75d509e7f Ports event system from Bay 2016-06-01 22:05:04 +01:00
Spades
a54e49fa73 Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' into GunsGunsGuns 2016-06-01 15:16:53 -04:00
Yoshax
0fb98bbabd Scheduler now uses btime, and other improvements 2016-06-01 17:56:07 +01:00
Spades
ff87150c3d Let's just have the one commit this time because I'm no longer paranoid of losing progress. 2016-06-01 12:48:48 -04:00
Neerti
3e3962c0a9 Merge pull request #1801 from Anewbe/more_hostile_mobs
PUNCH SPIDERS, GET MONEY
2016-06-01 00:37: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
Anewbe
5f02cb745d Fixes indentation error 2016-05-29 16:54:17 -05:00
Leshana
ff9b8a2a84 Make OOC_Notes easily and conveniently viewable when examining players. 2016-05-29 17:34:40 -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
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