Commit Graph

24302 Commits

Author SHA1 Message Date
Datraen
a1e278e978 Fixes #1144
Parses text rather than saving icon strings. Might be better to save the strings in the future into variables, done at the toggle level for custom items.
2016-07-13 21:59:34 -04:00
SinTwo
918e65b7b9 finished clothes (mostly) 2016-07-13 21:39:42 -04:00
Cameron653
b3b2fa5251 Update biogenerator.dm 2016-07-13 21:01:41 -04:00
Cameron653
3708e4d859 Fixes the costs of a few biogenerator products
Fixes the E-Z-Nutrient, Left 4 Zed, and Robust Harvest costs from the biogenerator.
They were listed as 60/120/150 for one, 300/600/750 for five even though the formulas for them (And what showed up on the biogenerator screen) suggested they should only cost 10/20/25 each.
Formulas:
([round(10/build_eff)])
([round(20/build_eff)])
([round(25/build_eff)])
2016-07-13 20:21:05 -04:00
Anewbe
d991c360d3 Increases the amount of damage limbs can take 2016-07-13 18:58:39 -05:00
Neerti
f9bf949098 Merge pull request #2120 from Anewbe/organ_split
Splits internal organs into separate files
2016-07-13 19:56:42 -04:00
Neerti
7df5bfded4 Merge pull request #2130 from Anewbe/ling_icons
Adds icons to the ling HUD
2016-07-13 19:47:22 -04:00
Anewbe
0325a2a5e6 Fixes a spelling mistake 2016-07-13 18:27:00 -05:00
Neerti
b0321958d1 Merge pull request #2115 from Yoshax/ED-Emag
Ensures security robots can be properly emagged
2016-07-13 19:14:23 -04:00
Neerti
9ac2ad0b86 Merge pull request #2113 from Yoshax/randomitems
Random item clean up, adjustment and addition
2016-07-13 19:11:50 -04:00
Neerti
f3cb92d327 Merge pull request #2110 from Anewbe/tox_buff
Speeds up toxin
2016-07-13 19:11:01 -04:00
Neerti
d7a9a4339c Merge pull request #2116 from Yoshax/droppods
Refactors the drop pod contents to make them a tad more useful and in general more iteresting
2016-07-13 19:10:28 -04:00
Anewbe
bc1d661ae8 Adds icons to the ling HUD 2016-07-13 18:05:46 -05:00
Yoshax
517dd50038 Merge pull request #2128 from Neerti/7/13/2016_younger_synths
Allows FBPs to potentially have different age limits.
2016-07-13 23:53:22 +01:00
Neerti
19779d8e0e Merge pull request #2112 from Anewbe/jobs_age
Adds player age req to Chemist and Atmos
2016-07-13 18:49:50 -04:00
Neerti
6e281def77 Allows FBPs to potentially have different age limits.
Cyborgs have their minimum be equal to their species' minimum, and maximum be their species maximum plus twenty years.
Posibrains have a minimum of 1, and a maximum of 220, as discussed by EmperorJon.
Digital brains (drones) have a minimum of 1 and maximum of 150, as discussed by Spookerton.
2016-07-13 18:25:07 -04:00
SinTwo
976847a0b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state
Conflicts:
	code/modules/clothing/head/jobs.dm
	icons/mob/items/lefthand.dmi
	icons/mob/items/righthand.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/items.dmi
2016-07-13 17:07:52 -04:00
SinTwo
1a400eb2cb pre-merge commit 2016-07-13 16:18:58 -04:00
Yoshax
fd9e8616e3 Ensure laser warfare drop pod has laser proof armor 2016-07-13 20:10:44 +01:00
Yoshax
dc7f0d6434 Merge pull request #2126 from Neerti/7/13/2016_health_hud_fix
Health Hud Prosthetics Fix
2016-07-13 20:07:16 +01:00
Neerti
bfd838fd5c Health Hud Prosthetics Fix
Adds two lines of code I forgot to port, hopefully should make the prosthetic icons for the HUD be correct now.
2016-07-13 14:46:21 -04:00
Neerti
334f24730e Merge pull request #2124 from Yoshax/hair
Adds a new hairstyle
2016-07-13 14:41:46 -04:00
Neerti
eeb234cf2a Merge pull request #2114 from Yoshax/CargoConsoleFix
Ensures cargo consoles can be properly emagged
2016-07-13 14:40:06 -04:00
Neerti
e5d24b1655 Merge pull request #2125 from Yoshax/runtimefi
Fixes 3 runtimes due to a null
2016-07-13 14:39:11 -04:00
Neerti
f2e0462dcb Merge pull request #2123 from Yoshax/languages
Makes languages great again
2016-07-13 14:38:33 -04:00
Yoshax
f86cbfd6df Fixes a runtime due to a null 2016-07-13 18:39:44 +01:00
Yoshax
f2f6ca54f2 Adds a new hairstyle 2016-07-13 18:34:46 +01:00
Yoshax
402e046576 Fixes languages not being properly added to mobs 2016-07-13 18:12:15 +01:00
Yoshax
cda6508001 Merge pull request #2119 from Anewbe/burning_bodies
Burning bodies no longer burn forever
2016-07-13 17:13:16 +01:00
Yoshax
3df18c2870 Merge pull request #2111 from Serithi/LAVENDER_UNBORKIFICATION
Properly alphabetizes lavender in the vending machines.
2016-07-13 17:10:10 +01:00
Anewbe
7946349294 Splits internal organs into separate files 2016-07-12 22:32:09 -05:00
Anewbe
b08ddfefff Fixes lighters being able to ignite people while off. 2016-07-12 22:13:04 -05:00
SinTwo
91b6ca3d7b item states are awful 2016-07-12 23:02:29 -04:00
Anewbe
811a7be362 fire_stacks decrease over time 2016-07-12 21:27:04 -05:00
Neerti
f7d8f2cb58 Merge pull request #2118 from Woodratt/1.5.5_fancyuniforms
1.5.5 Fancy Green Uniforms
2016-07-12 21:17:07 -04:00
woodratt
47ab279b9b 1.5.5 Fancy Green Uniforms
- Adds, one green suit and formal jacket.
- One new military like jacket that can be selected from the loadout.
- A new holster type, leg holster. Can be selected from the loadout as well.
- Cleaned up a couple of the sprites for outfits that have ties (rolled up sleeve versions on a couple still had the tie sprite).
2016-07-12 17:19:39 -07:00
Anewbe
124fe62c55 Allows admins to call an ERT without the announcement 2016-07-12 19:02:16 -05:00
Yoshax
51876c97fe Adjusts the crates and adds one more 2016-07-12 22:53:20 +01:00
Yoshax
628a878199 Refactors the drop pod contents to make them a tad more useful and interesting 2016-07-12 22:45:15 +01:00
Yoshax
44d0ee657c Ensures bots are only emaggable once 2016-07-12 21:40:07 +01:00
Yoshax
ecb2c9d5d7 Adds changelog 2016-07-12 20:33:55 +01:00
Yoshax
9689dd1e17 Ensures security robots can be properly emagged, also makes them stronger when emagged 2016-07-12 20:08:25 +01:00
Yoshax
f5b1d73ba2 Ensures cargo consoles can be properly emagged 2016-07-12 20:01:50 +01:00
Yoshax
527b71335e Random item clean up, adjustment and addition 2016-07-12 19:55:10 +01:00
SinTwo
8847891d12 update 2016-07-12 01:15:27 -04:00
Anewbe
e9a872f8e3 Adds player age req to Chemist and Atmos 2016-07-12 00:01:26 -05:00
Serithi
8ad6f5e626 Properly alphabetizes lavender in the vending machines. 2016-07-11 20:16:56 -07:00
Anewbe
52a7c0d797 Speeds up toxin 2016-07-11 22:04:15 -05:00
SinTwo
7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00
Yoshax
defde9673a Merge pull request #2087 from Anewbe/borg_lives_matter
Removes the Robot Console's ability to blow up borgs
2016-07-11 19:55:34 +01:00