Commit Graph
14005 Commits
Author SHA1 Message Date
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
Datraen 22a69471c8 Merge pull request #1737 from Yoshax/cheekysuitsensor
Makes suit sensors produce a message when changed and generalizes message
2016-05-25 15:03:46 -04:00
Yoshax 80434f41a6 Makes suit sensors produce a message when changed and generalizes message 2016-05-25 19:42:26 +01:00
Datraen 85f3dc84e4 Adds component requirements, adds tech levels, fixes copy error. 2016-05-25 14:40:55 -04:00
Datraen 9e09720be5 Final Initial Implementation of Xenobio2 System.
Kinks worked out, everything is functioning as it should.
2016-05-25 14:11:37 -04:00
Yoshax 9b8aefed5b Adds towels 2016-05-25 18:38:16 +01: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
Datraen 43be60c262 Merge pull request #1734 from Yoshax/bugfixes
Removes unused xeno stuff + a bug fix
2016-05-24 22:30:52 -04:00
Datraen 49a83f293f Merge pull request #1732 from VOREStation/lessthanthreeyosh
Fixes two issues
2016-05-24 22:29:57 -04:00
Yoshax 6ff7293585 Removes unused Xeno stuff 2016-05-24 23:48:52 +01:00
Arokha Sieyes 156ad00d49 Fixes #1714
Removes duplicate code, and fixes the logic of the original code that was supposed to perform the same function, but did not, due to bad if-statement logic. Performed eye removal, and eye transplant to test. I would have liked to have fixed the flat `blinded = 0` at the top of the file, but it's so ingrained in how it works now, I could not.
2016-05-24 13:12:08 -04:00
Arokha Sieyes 2e263ffc07 Fixes #1655
Don't snowflake one mode with new(). Setting this on new() causes
weirdness when new() is called (prints unexpected messages to players
about the mode being toggled). If you really want it, define the var as
equal to the bitflag in the definition and update the starting human HUD
to match. Don't change it 'after' if that's always how you want it.
2016-05-24 12:12:26 -04:00
Yoshax eaee6b7af9 Ensures special role returns true non-gamemode antags 2016-05-24 02:04:08 +01:00
SinTwo ba4fa36984 Adds UI and a few fixes 2016-05-23 17:59:41 -04:00
Yoshax 02fa5585c5 Fixes loadout skirts all spawning as black skirts 2016-05-23 19:35:13 +01:00
Datraen 96be57d787 Merge pull request #1720 from Anewbe/hardsuit_slowdown
Hardsuit Slowdown fix
2016-05-22 19:23:30 -04:00
Datraen 864ffc8f24 Merge pull request #1724 from Anewbe/removes_horsehead
Removes 2 spells from wiz until we get NewWiz (*COUGH NEERTI COUGH*)
2016-05-22 19:22:07 -04:00
Datraen 6af9bee876 Merge pull request #1723 from Yoshax/loadoutfixes
Replaces instances of Xenobotanist in loadout with Xenobiologist
2016-05-22 19:21:46 -04:00
Yoshax 2f73167f39 Fixes chocolate milk seeming like milk in a glass 2016-05-22 18:56:53 +01:00
Anewbe 9e7676cc17 Removes Horsehead and Mindswap from Wizard spellbooks 2016-05-22 11:38:09 -05:00
Yoshax 334a0238ae Replaces instances of Xenobotanist in loadout with Xenobiologist 2016-05-22 14:22:47 +01:00
Spookerton 9d250e4062 Merge pull request #1716 from Anewbe/warden_armor_tweaks
Warden Jacket protects legs
2016-05-22 11:22:48 +01:00
Anewbe 5c0a4215a2 Moves all slowdown for Hardsuits to the backpack 2016-05-21 21:43:40 -05:00
Anewbe 0221b9bb9d Changes some fluffy bits to be more accurate 2016-05-21 18:00:54 -05:00
Anewbe 8c2d80aaf8 Warden Jacket protects legs 2016-05-21 17:45:01 -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 3044f6c080 Fixes never being able to light molotovs and makes throwing them less crap 2016-05-21 15:10:49 +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 40445a3065 Gives Skrell their warblenames back.
Current Skrell lore dictates that while these are the Skrell's true names, they take up names that are human or make their own names pronounceable to humans. Having the ability to randomly generate the Skrell name is ideal if you want to have a humanized Skrell name, whereas randomly generating a human name can be done off of a human slot.
2016-05-20 11:13:51 -04:00
Neerti 460c3a6835 Merge pull request #1696 from Yoshax/cableimprovement
Cable coil adjustments and changes
2016-05-20 06:09:24 -04:00
Leshana 11352bd429 Fixes #1660 - Photos no longer show everyone naked.
* update_inv_ears() overlays left and right ears upon a "blank" icon.  Unfortunately doing ```image("icon" = null)``` encourages BYOND to create an image of the current mob!   So everyone's "ears" icon is actually their whole body, layerd on top of uniforms, hair, etc.
* Lets not do that.  A transparant image is already in effects.dmi for this purpose.
2016-05-19 22:40:49 -04:00
EmperorJon 365ea43a60 Merge pull request #1687 from Yoshax/surgeryfix
Fixes beating people up during surgery
2016-05-19 23:43:51 +01:00
Datraen be36d1f2c0 Merge pull request #1702 from Mark9013100/5/19/2016corpsec_jumpsuit_edits
Removes leg trim on the corp-sec uniforms
2016-05-19 18:18:11 -04:00
Datraen 4772dc6b10 Merge pull request #1703 from Yoshax/bugfixes
Bug Fix Boogalo
2016-05-19 18:18:00 -04:00
Datraen c1685a7328 Merge pull request #1704 from VOREStation/microfix
Removes "Teshari Eraser" Feature
2016-05-19 18:12:49 -04:00
Arokha Sieyes 747e6322be Removes "Teshari Eraser" Feature
Oops. Didn't quite math that one out in my head I guess.
2016-05-19 17:58:21 -04:00
Yoshax 3c3901ddd8 Fixes #1527 2016-05-19 22:51:58 +01:00
Yoshax 304bf6062c Fixes #1444 2016-05-19 22:41:56 +01: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 bfdd155e89 Fixes #1136 2016-05-19 22:25:40 +01:00
Mark9013100 c5cd4c6f97 Removes leg trim on the corp-sec uniforms 2016-05-19 17:04:35 -04:00
Yoshax 3337302e82 Makes randomise appearance slightly less crap and actually randomise
Fixes #1227
Fixes #369
2016-05-19 21:20:17 +01: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
SinTwoandDatraen a87c8de3fd HTML5 and CSS3 (#1677)
* Updates to HTML5 and CSS3

* UI Tweaks and Fixes
2016-05-19 14:28:38 -04:00
Arokha Sieyes a50286e5e8 Fixes #993
Calls the final HUD update later (higher, in mob/death) since stat was not yet DEAD (2) when it was called before.

Also makes all mobs update the HUDs all life() ticks, so people who have ghosted and left a body have correct HUD readings. If this affects performance, sorry? ... It really shouldn't. Only carbons should have real HUDs to update. The rest are tiny little procs.
2016-05-19 13:30:12 -04:00
Yoshax 8d72648ae6 Adjusts and adds more colors of cables
Removes limitation of being unable to join different colors of cable
Allows merging of different kinds of cable
Adjusts the color changing proc to be nicer as per Baystation12/Baystation#11645
2016-05-19 18:13:12 +01:00
Arokha Sieyes 7f53a7cf85 Fixes #1457
I realize that preventing 'remote stripping' literally ruins the game. I'm sorry. do_after needs a target for movement checks against them as well.
2016-05-19 12:30:03 -04:00
Arokha Sieyes 5e59efd8dc Fixes #802
OR not AND
2016-05-19 12:09:50 -04:00