Commit Graph

7073 Commits

Author SHA1 Message Date
Anewbe
c831df104b Merge pull request #3041 from PolarisSS13/revert-3018-master
Revert "BlockHeadHair doesn't make players bald."
2017-03-03 18:29:46 -06:00
Anewbe
01109d3b8d Fixes the slowdown bug 2017-03-03 17:38:55 -06:00
Anewbe
81549fc965 Revert "BlockHeadHair doesn't make players bald." 2017-03-03 17:19:07 -06:00
Anewbe
a0198fb947 Merge pull request #3022 from VOREStation/infections
Infection code improvement
2017-03-02 19:54:26 -06:00
Anewbe
bb2adf1290 Merge pull request #3021 from Neerti/2/23/2017_porting_map_datum_system
Ports a large chunk of the map datum system that europa/bay uses.
2017-03-02 16:32:02 -06:00
Leshana
3900225f53 Fix custom items appearing in random space turfs
* If a custom item can't be equipped to a character's inventory it is dropped on the ground.  For late join characters, equip_custom_item() was called before the mob was placed at their starting locations; their coordinates were still 1,1,1.   Which is the edge of a map so they get bounced to another z level.
* Fix: Equip custom items AFTER job_master.LateSpawn places the mob at the starting location, so it flows in same order as roundstart join characters.
2017-03-01 17:51:32 -05:00
Anewbe
8af4c2ba46 Merge pull request #3024 from Cameron653/master
Prevents halloss showing up as actual wounds on self examine
2017-03-01 15:03:44 -06:00
Neerti
813a61ef29 Merge pull request #3011 from Anewbe/simple_mob
Tasers can hurt simple mobs
2017-02-28 21:28:07 -05:00
Anewbe
dc165906fa Merge pull request #3018 from nachomeep/master
BlockHeadHair doesn't make players bald.
2017-02-28 19:51:42 -06:00
Arokha Sieyes
2c493405bd More tweaks
Fix necrotic limb surgery
Make fever not so powerful that it resists cryotubes
All necrotic limbs produce toxins unless OD on spaceacillin, regardless of infection
Fix dropper use during surgery
Fix 'gap' in printable adv scanner infection reports
Fix nanoui template for adv scanner
Add examine text to gangrene and highly infected external limbs
Add flags to the MMI holder organs to make them robotic, and thus not infectable if they are > squishy MMI (posibrain, digital)
2017-02-28 01:13:29 -05:00
Cameron653
073d8b4fc4 Prevents halloss showing up as actual wounds on self examine 2017-02-27 19:58:47 -05:00
Arokha Sieyes
9ef7496545 Infection code improvement WIP 2017-02-27 16:35:56 -05:00
Neerti
12abb2d6f2 Ports a large chunk of the map datum system that europa/bay uses.
Links many map-specific details such as the station name, z-level information, and allowed jobs from global vars to map datum vars, which should help us maintain multiple maps at once in the future, which will be needed for the future Southern Cross.
Note that a config change will be needed to change GENERATE_ASTEROID to GENERATE_MAP, otherwise no changes should be required to continue normal map usage.
To change to a different map, it's suggested to tick the file that ticks all the other needed files, which for the Northern Star is called northern_star.dm.
2017-02-27 07:36:41 -05:00
nachomeep
2d4cf21dc3 fixes minor screwup 2017-02-26 16:53:07 -05:00
nachomeep
69195b2ae4 Returns gender flags 2017-02-26 16:51:43 -05:00
nachomeep
5828504f2f No bearded women. 2017-02-26 12:13:09 -05:00
nachomeep
cdb6c32c91 Fixes a few things, adds changelog. 2017-02-25 10:18:10 -05:00
nachomeep
9d3aba5832 Fixes blockheadhair tag. 2017-02-25 09:49:24 -05:00
Anewbe
ada83d45c6 Merge pull request #3006 from VOREStation/synthair
Don't give synthetics the survival kit
2017-02-24 18:51:59 -06:00
Anewbe
d1e7c37a8c Tasers can hurt simple mobs 2017-02-23 18:24:13 -06:00
Anewbe
3bd665d797 Merge pull request #3001 from Neerti/2/2/2017_planet_stuff
Adds framework for planetary maps
2017-02-23 15:18:03 -06:00
nachomeep
e0ef593ce4 Updates language syllables and text. (#3000)
* Adds a lot of languages.

* Removes the languages I just added.

Instead updates old ones.

* Fixes a minor typo.

* how the hell did i accidentally remove sinta'unathi

Returns that stuff.

* Fixes two things.

* doesnt actually change name length
2017-02-23 15:17:14 -06:00
Arokha Sieyes
fd6785277f Further tweak spawn boxes
Now you get an empty box if you're synthetic rather than nothing
2017-02-22 22:59:36 -05:00
Arokha Sieyes
75945a659b Don't give synthetics the survival kit
What're they gonna do with it, anyway? Other than just make a pile of them in arrivals.
2017-02-22 10:11:52 -05:00
Neerti
6377efd763 Fixes a few things, most notably the human layering number. 2017-02-22 00:36:47 -05:00
Neerti
d398367e4c Fixes a world << that crept in and apparently new lobby code. 2017-02-20 19:29:13 -05:00
Neerti
91dd3348c5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 2/2/2017_planet_stuff
# Conflicts:
#	code/modules/mob/living/carbon/human/human_movement.dm
2017-02-20 19:06:25 -05:00
Neerti
836d8dfa3f More stuff, finalizes it I hope. 2017-02-20 18:28:31 -05:00
Neerti
1d9e7c8c08 works on planet stuff 2017-02-06 20:45:21 -05:00
Screemonster
cdc4e6e0f8 Adjusts CE_SPEEDBOOST to not just return -3 2017-02-07 00:48:43 +00:00
Anewbe
587044275c Merge pull request #2975 from Anewbe/spider_nerf
Spiders inject fewer spiderlings
2017-02-01 21:58:26 -06:00
Anewbe
fd1ade9982 Spiders inject fewer spiderlings 2017-01-31 21:57:39 -06:00
Neerti
088ebc328e Fixes Borg Typing Indicator
Borgs that are typing will no longer lose the indicator a second later.
2017-01-31 16:28:41 -05:00
Anewbe
62d19de99f Merge pull request #2929 from Anewbe/taste
Ports taste from Bay
2017-01-28 21:06:21 -06:00
Anewbe
f924f5ef05 Diona can regrow limbs 2017-01-27 23:47:44 -06:00
Anewbe
a6782f4371 Merge pull request #2944 from Anewbe/vox_toys
Adds and tweaks Vox toys
2017-01-26 22:42:53 -06:00
Anewbe
09ce761931 Adds Medical and Meson Aviators 2017-01-26 22:25:37 -06:00
Anewbe
6816af4485 More toys kikiki 2017-01-25 22:20:52 -06:00
Yoshax
8a5b09c539 Fixes slipping + lube 2017-01-25 20:33:11 +00:00
Anewbe
3be442e766 Merge pull request #2947 from Anewbe/surgery_things
Surgical tools will no longer cause damage on help intent
2017-01-21 22:38:25 -05:00
Anewbe
ac4b355f5e Surgical tools will no longer cause damage on help intent 2017-01-21 18:34:05 -06:00
Anewbe
a0343133dd Merge pull request #2941 from Mechoid/Multi-SpriteSet
Allows individuals to have multiple custom Borg Sprite-Sets.
2017-01-21 19:23:36 -05:00
Anewbe
e23f5c2dd0 Vox airtank fix 2017-01-20 18:04:12 -06:00
Anewbe
27ea27964e Adds and tweaks Vox toys 2017-01-19 21:28:51 -06:00
Anewbe
86077f6c1a Broken bones work differently 2017-01-19 15:32:58 -06:00
Mechoid
1363fb49c3 Allows individuals to have multiple custom borg sprite-sets without using multiple ckeys.
Small modification of robot.dm to make both custom sprite set-ings compliant with one-another.
2017-01-19 01:35:33 -08:00
Anewbe
9a451c826e Human mobs spawn in with a random amount of nutrition 2017-01-17 23:07:17 -06:00
Anewbe
81c8570ba8 Merge pull request #2904 from Anewbe/theUnboxingBegins
Returns the Vox, who now breath Phoron
2017-01-17 23:49:14 -05:00
Anewbe
6827f81b37 Merge pull request #2933 from Anewbe/robot_vomit
Tweaks some emotes
2017-01-17 23:20:45 -05:00
Anewbe
d53cfc4773 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into theUnboxingBegins
# Conflicts:
#	code/modules/mob/new_player/sprite_accessories.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
#	icons/mob/human_face.dmi
#	icons/mob/suit.dmi
2017-01-17 22:05:38 -06:00