Commit Graph

11859 Commits

Author SHA1 Message Date
SinTwo
8edec2a5d1 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into frame_fix 2016-06-01 17:53:51 -04:00
Datraen
2c95126a00 Merge pull request #1765 from Yoshax/cocainecocaine
Fixes snow and adjusts a definition
2016-06-01 15:57:15 -04:00
SinTwo
2d7d011d9e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into frame_fix
Conflicts:
	maps/polaris-1.dmm
	maps/polaris-5.dmm
2016-06-01 14:47:21 -04:00
SinTwo
5d25d72593 Frame Fixes 2016-06-01 14:32:56 -04:00
Datraen
a7abdb5c86 Merge pull request #1845 from Yoshax/preperationsforbigports
Scheduler now uses btime, and other improvements
2016-06-01 14:21:28 -04:00
Yoshax
0fb98bbabd Scheduler now uses btime, and other improvements 2016-06-01 17:56:07 +01:00
Yoshax
0fac31fad3 Fixes being able to buckle more than one mob to bucklable things 2016-06-01 16:34:07 +01:00
Yoshax
d32a708ec7 Fixes snowy overlays layering 2016-06-01 16:01:36 +01:00
Yoshax
0777379d37 Fixes box of EMP grenades only ever spawning 1 grenade 2016-06-01 02:00:57 +01:00
Arokha Sieyes
f23035c9ed Make Exosuit Fabs Great Again
S'what I get for copypasting suggestions I guess.
2016-05-31 18:45:08 -04:00
Datraen
36d9cee0f7 Merge pull request #1806 from VOREStation/limbprinter
Make FBPs Constructable
2016-05-31 15:50:32 -04:00
Arokha Sieyes
76e4afa6d7 Fix suggested by Ginja 2016-05-31 15:38:24 -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
Neerti
1411f6682e Merge pull request #1818 from EmperorJon/30_May_Runtime_fix_and_changelog
Fixes and changelog
2016-05-30 15:59:56 -04:00
Spades
26c759c7ad Fixes #1813 (#1815) 2016-05-30 19:57:06 +01:00
Jon
d7f1f01a35 Changelog for the past few changes plus a fix to a runtime I encountered with assistants and alt-titles. 2016-05-30 19:35:43 +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
Broseph Stylin
333603ce51 Adds working double beds. (#1807)
* Adds double beds.

* Adds double bedsheets + Ian single bedsheet.

* Adds double bedsheet sprites.

* Adds double bed sprites.

* Fixes a stupid item_state mistake.
2016-05-30 19:03:56 +01:00
Yoshax
1a203e131a Merge pull request #1792 from Neerti/5/28/2016_ling_changes
Some Changeling Changes
2016-05-30 13:53:18 +01:00
Hubblenaut
8a49ad330c Spaceheater/Recharger Power Changes
- Spaceheater now spawns with a high-capacity cell and set to 20 Kelvin.
 - Recharger now charges devices with 40 kW rather than 15 kW.
2016-05-30 13:23:58 +02:00
Arokha Sieyes
4c86fabb63 Tags. 2016-05-30 05:32:11 -04:00
Arokha Sieyes
1b9b3ba124 Update Exosuit fab and new machine to use materials system 2016-05-30 05:29:37 -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
Neerti
3372d3ffee Some Changeling Changes
Bioelectrogenesis effectiveness can now be hindered by their gloves' electrical resistance.  Wearing insulated and making your hands create electricity won't be a good idea now.
Fake death is now much more real, inflicting the changeling with a large amount of oxygen damage, causing actual death, which fixes a lot of inconsistencies and bugs involving the game not checking for FAKEDEATH, as that is no longer needed with actual death.
The text received when obtaining the revive verb is now much larger, to make it easier to see.
Revival now undislocates all limbs.
Changes failure message received when you try to revive when absorbed to be consistent in style with other ling messages.
2016-05-29 21:47:50 -04: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
722c099847 Merge pull request #1788 from Datraen/Xenobio2_Tweaks
Xenobio2 tweaks
2016-05-29 03:56:39 +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
Jon
21f898e047 First commit of manual port of BS12
#13042
and
#13086
2016-05-29 00:56:11 +01:00
Mark9013100
71075c600e Renames the classic EMP grenade 2016-05-28 17:12:43 -04: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
Datraen
a4e2b803f5 Adds a map http://i.imgur.com/ZI1gKc1.png
Also updates slime storage to handle all xenobio products.
Also adds a missing component_parts = list().
2016-05-28 15:01:22 -04:00
EmperorJon
7b6b80572a Merge pull request #1784 from Yoshax/gibsfix
Fixes invisible gibs
2016-05-28 18:33:29 +01:00
Yoshax
fc49627232 Merge pull request #1783 from PolarisSS13/revert-1767-doorfix
Revert "Fixes doors sparking as if damaged when spawned or created by RCD"
2016-05-28 18:22:07 +01:00
Yoshax
af4b67d418 Fixes invisible gibs 2016-05-28 18:20:59 +01:00
Neerti
4c28651d3f Merge pull request #1777 from Yoshax/techspawnfix
Adjusts random tech to spawn random cable instead of always red
2016-05-28 13:17:41 -04:00
EmperorJon
6a667100ba Revert "Fixes doors sparking as if damaged when spawned or created by RCD" 2016-05-28 18:15:42 +01:00
Neerti
cbd4915420 Merge pull request #1592 from Anewbe/borg_changes
Various Borg Changes
2016-05-28 12:44:27 -04:00
Anewbe
1d3a57cd76 Pathing Tweaks (#1719)
* Edits some pathing references

* Cleans up a spacing thing

* Map thing

* Adds the \improper tag to NT breacher gear, for improved grammar
2016-05-28 17:17:41 +01:00
Yoshax
19102ea3f3 Merge pull request #1776 from Mark9013100/5/27/2016blue_carpet
Adds blue carpet stack
2016-05-28 14:38:53 +01: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
Datraen
7835c89bec Merge pull request #1767 from Yoshax/doorfix
Fixes doors sparking as if damaged when spawned or created by RCD
2016-05-28 00:06:37 -04:00
Yoshax
1237d361a5 Adjusts random tech to spawn random cable instead of always red 2016-05-28 04:42:05 +01:00
Mark9013100
41de641287 Adds blue carpet stack 2016-05-27 22:34:35 -04:00
EmperorJon
12bc3d2622 Merge pull request #1764 from Yoshax/adminlooc
Adds preference to mute remote LOOC chatter heard by admins.
2016-05-28 01:52:15 +01:00
Yoshax
f778f29b9d Finishes snowy stuff, adds overlays etc 2016-05-28 01:45:03 +01:00