Commit Graph

5721 Commits

Author SHA1 Message Date
Datraen
2c95126a00 Merge pull request #1765 from Yoshax/cocainecocaine
Fixes snow and adjusts a definition
2016-06-01 15:57:15 -04: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
Datraen
36d9cee0f7 Merge pull request #1806 from VOREStation/limbprinter
Make FBPs Constructable
2016-05-31 15:50:32 -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
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
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
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
Yoshax
df0135ac2b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into attackcall 2016-05-29 01:00:50 +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
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
Neerti
cbd4915420 Merge pull request #1592 from Anewbe/borg_changes
Various Borg Changes
2016-05-28 12:44:27 -04: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
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
Yoshax
f778f29b9d Finishes snowy stuff, adds overlays etc 2016-05-28 01:45:03 +01:00
Yoshax
cbe932d1ed Merge pull request #1746 from VOREStation/constructions
Fixes Exosuit Fabricator Deconstruction and makes Jukeboxes constructable
2016-05-27 14:41:46 +01:00
Datraen
ed5baa120e Merge pull request #1750 from Yoshax/towelfix
Fixes towel hit sound
2016-05-26 15:44:28 -04:00
Datraen
d73cdc7307 Merge pull request #1751 from Yoshax/tapefix
Mapped tape rolls can now apply themselves.
2016-05-26 15:43:37 -04:00
Asanadas
b90e8c68c6 Deepest lore. Change a poster description to match policy. 2016-05-26 18:39:46 +01:00
PsiOmegaDelta
92b97e1d2d Mapped tape rolls can now apply themselves.
Can be applied to anything as long as it's airlocks. Ensures proper layering, icon state, etc. Fixes #13058
2016-05-26 17:53:00 +01:00
Yoshax
5ad5206db3 Fixes towel hit sound 2016-05-26 16:48:25 +01: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
Leshana
844ea7febc Allow building lights on windows. 2016-05-25 21:43:59 -04:00
Leshana
e37ac4da3e Fixes #145 - Makes jukeboxes constructable.
* Adds circuit board.
* Adds design to print board on autolathe.
* Makes jukeboxes deconstructable back to frame.
2016-05-25 21:35:24 -04:00
Datraen
3b72b362d7 Fixes #530 2016-05-25 17:11:36 -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
Yoshax
9b8aefed5b Adds towels 2016-05-25 18:38:16 +01:00
Anewbe
d2b43bd5a4 Prevents the Robocalypse 2016-05-22 14:51:35 -05:00
Anewbe
0221b9bb9d Changes some fluffy bits to be more accurate 2016-05-21 18:00:54 -05:00
Datraen
dd4483d055 Merge pull request #1710 from Yoshax/fitnessvendor
Adds a new vending machine that vends fitness related products
2016-05-21 12:11:29 -04:00
Yoshax
0a6d1aa08d Makes detective belts hold detective guns 2016-05-21 15:21:07 +01:00
Datraen
a797f2007a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3 2016-05-20 22:39:33 -04:00
Yoshax
6142af14d2 Adds a new vending machine that vends fitness related products 2016-05-20 22:04:00 +01:00
Datraen
4772dc6b10 Merge pull request #1703 from Yoshax/bugfixes
Bug Fix Boogalo
2016-05-19 18:18:00 -04:00
Datraen
bb7713b2a8 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3
# Conflicts:
#	code/game/objects/items/devices/multitool.dm
2016-05-19 17:31:25 -04:00
Yoshax
b6efd91e92 Fixes #1163 2016-05-19 22:30:31 +01:00
Datraen
861dc04e89 Merge pull request #1699 from SinTwo/communicator_fix
Fixes Note Keeper and Empty Message
2016-05-19 15:40:36 -04:00
Datraen
ce6b574d67 Status as of 05-18-2016 2016-05-19 15:16:48 -04:00
Datraen
ec3e4a0315 Merge pull request #1698 from VOREStation/bored,_fix_polaris
Fixes two high-priority issues
2016-05-19 14:29:46 -04:00
SinTwo
a39d2c5cc6 Fixes Note Keeper and empty message sending null 2016-05-19 14:17:12 -04:00
Arokha Sieyes
79684a3488 Fixes #1636
Donut boxes only held 6 because they had 6 stuffed into them by New(). The empty ones didn't have that. This manually sets the size to hold 6 donuts.
2016-05-19 11:36:18 -04:00