Commit Graph

14293 Commits

Author SHA1 Message Date
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
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
Datraen
eb0629add2 Merges new for MMI/Posibrains, fixes runtimes from posibrains. 2016-05-29 17:57:16 -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
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
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
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
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
Neerti
16a3cea917 Merge pull request #1782 from Yoshax/dressup
Fixes /under/ being fucked
2016-05-28 13:16:26 -04:00
Yoshax
f7653114c3 Fixes /under/ being fucked 2016-05-28 18:09:27 +01:00
Spades
356b5e63cd Merge pull request #232 from VOREStation/ian-storm
IAN STORM
2016-05-28 13:08:37 -04:00
Spades
bf2b649960 Merge pull request #233 from VOREStation/pretty-secrets-144
Organize and Beautify Admin Secrets Panel
2016-05-28 13:08:29 -04: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
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
698e44275d Removes map/New()s, adds changelog. 2016-05-28 00:31:25 -04:00
Datraen
990d257d08 Merge pull request #1763 from Yoshax/burninglove
Adjusts rags to be able to use alcohol to be set alight
2016-05-28 00:06:21 -04:00
Leshana
b9c10b49f8 Copied over those them there inventory icons for all species voidsuits! Also added them to items. 2016-05-27 21:25:59 -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
Leshana
2148ae20d5 Fixes Issue #230 - Void suit body sprites not visible.
Cause is somewhat complicated:
* Custom vore code in update_icons will use 'item_state' as the icon state if icon_override is set on a suit.
* Suit refit machines will set icon_override on suits if the sprite_sheet_refits variable matches.
* However icon_override is not actually used anymore because of the species sprite sheets.
* Therefore it breaks.  By making this change we ensure that icon_override is not set, so the custom vore code does not apply, and the item_state is not allowed to overrule the icon_state.
2016-05-27 19:46:06 -04:00
EmperorJon
210d6c87bd Merge pull request #1772 from Yoshax/dressup
Splits suit jackets and ties from some suits
2016-05-27 23:59:52 +01:00
Yoshax
f7377a476b Merge pull request #1769 from VOREStation/pretty-secrets
Organize and Beautify Admin Secrets Panel
2016-05-27 23:53:29 +01:00
comma
b157ebfbac Breaks up some suits into parts
-Detective suit with vest (vest, tie)
-Charcoal suit (jacket,tie)
-Burgundy suit (jacket,tie)
-Navy suit (jacket,tie)
-Tan suit (jacket,tie)
2016-05-27 23:33:54 +01:00
comma
2daedf836b Made ties on some suits detachable
-Detective suit, grey
-Detective suit, dark
-Lawyer suit, blue,
-IA suit
2016-05-27 23:18:59 +01:00
Daranz
afcbebfe54 Fix on-spawn captain's medal attaching 2016-05-27 23:02:00 +01:00
Zuhayr
6281516826 Generalizes the accessory system to work for suits. 2016-05-27 23:01:47 +01:00
Leshana
9f699257de Organize and Beautify Admin Secrets Panel
* Add browser styles to Admin Secrets panel to make it look nice.
* Show only one category at once, with buttons to switch between categories at the top.
2016-05-27 16:32:46 -04:00
Leshana
396a094fb1 Organize and Beautify Admin Secrets Panel
* Add browser styles to Admin Secrets panel to make it look nice.
* Show only one category at once, with buttons to switch between categories at the top.
2016-05-27 16:29:04 -04:00
redstryker
420f2c8463 Adds Tracksuits 2016-05-27 15:19:07 -04:00
SinTwo
8bff04dac0 adds four new hair styles. 2016-05-27 13:43:03 -04:00
Leshana
76df443940 IAN STORM
Added a new event: Ian Storm.  Yes.
2016-05-27 13:30:33 -04:00
Yoshax
ce9b4e8109 Adjusts molotovs to be able to use alcohol to set the rag alight 2016-05-27 15:39:35 +01:00
Leshana
219db3d868 Adds preference to mute remote LOOC chatter heard by admins.
* Lets people remain on standby for adminhelps without having all that spam scrolling stuff off the screen if they are not taking on the role of policing LOOC.
2016-05-27 15:10:29 +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
Leshana
7bd3e1ddd0 Fix the on-mob icon for vulpine belt! Oops! 2016-05-26 21:40:10 -04:00
Yoshax
9ed1f2f495 Adds Cards Against The Galaxy to loadout 2016-05-27 00:48:08 +01:00
Yoshax
2624297495 Merge pull request #1757 from VOREStation/stutter
Fixes Stuttering
2016-05-26 21:29:36 +01:00