Commit Graph

15171 Commits

Author SHA1 Message Date
Anewbe
44cd464941 Adds a check for custom items 2017-03-06 21:25:54 -06:00
Neerti
9b13c7367c Merge pull request #3057 from Anewbe/tails
Edits Taj and Unathi tail sprites
2017-03-06 19:02:58 -05:00
Anewbe
132d9a7611 Edits Taj and Unathi tail sprites 2017-03-06 14:41:06 -06:00
Anewbe
13d161565e Merge pull request #3055 from VOREStation/missinghud
Add TOTAL_HUDS define
2017-03-06 13:51:01 -06:00
Arokha Sieyes
e65ef1b0d6 Add TOTAL_HUDS define
Making a list just... 'be 10 long' is bad. Like update_icons layers and various other things, if you add more, it will compile fine and then you get runtimes later, which is a little annoying. Having places you just have to 'know' to update elsewhere in the code is meh.
2017-03-06 01:07:46 -05:00
Anewbe
d68292b236 Merge pull request #3002 from Anewbe/plant_things
Space Vines are more dangerous
2017-03-05 14:15:13 -06:00
Anewbe
05e6ef5ad8 Merge pull request #2988 from Anewbe/boots
Boots are now a subtype of shoes
2017-03-05 14:13:47 -06:00
Anewbe
36f80e9eda Merge pull request #3046 from Neerti/3/4/2017_turbolift
Ports Turbolifts from Bay.
2017-03-05 14:11:15 -06:00
Yoshax
eeed8496cf Fixes the paperwork date insert 2017-03-05 03:10:11 +00:00
Neerti
411bd2b05b Ports Turbolifts from Bay. 2017-03-04 21:35:00 -05:00
Anewbe
283071d9db Merge pull request #3035 from Neerti/3/2/2017_example_map
Adds Multi-Z Test Map
2017-03-04 15:26:49 -06:00
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
Neerti
0f781e36a7 Adds Multi-Z Test Map 2017-03-03 09:40:34 -05:00
Anewbe
a0198fb947 Merge pull request #3022 from VOREStation/infections
Infection code improvement
2017-03-02 19:54:26 -06:00
Anewbe
9ca2d1223e Merge pull request #3031 from Dankman/master
Fixing issues with the Xenobiology Computer.
2017-03-02 17:51:48 -06:00
Anewbe
a45ef074bd Merge pull request #3029 from VOREStation/blood
Make blood loss/heart removal make sense
2017-03-02 17:03:44 -06:00
Anewbe
25b925f04c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into boots
# Conflicts:
#	maps/northern_star/polaris-1.dmm
#	maps/northern_star/polaris-2.dmm
2017-03-02 16:53:29 -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
Dankman
028d7a0ec6 Merge remote-tracking branch 'refs/remotes/PolarisSS13/master' 2017-03-01 17:00:29 -05:00
Dankman
a2e09a2f10 Fixing one slight issue.
I'm an idiot, forgot about garbage collecting. This fixes a slight issue
in my previous PR that would have eventually resulted in a call of DEL
if nobody rebuilt the console.
2017-03-01 16:59:13 -05:00
Dankman
60002d04cc Fixing runtimes, making things functional for the Xenobiology Console
The old build path pointed towards a circuitboard instead of towards the
machine, meaning when you screwdrivered the frame twice, it would cause
frame.dm to runtime, and then not delete the frame, meaning you could
spam click the console with a screwdriver and spawn infinite boards, and
still be stuck with a non functional machine.

injector.computer = null was causing a runtime because it was attempting
to edit something that no longer existed on destruction.
2017-03-01 16:26:42 -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
Arokha Sieyes
e1da67d37f Make blood loss/heart removal make sense
Right now it gives you 300 toxin damage "to be sure" you die. That's a little odd. Especially on health scanners after someone has bled to death. And you can't do heart transplants. We can do heart transplants now in 2017. 3500 per year. Pretty sure they won't forget how by 2561 or whatever.

This makes having no heart or too little blood do 75 oxyloss per tick. Enough to kill you eight seconds if you have no special care. It becomes 15 per tick with dexP which is fast enough to kill you "pretty fastly" and slow enough you can swap out a heart in surgery.

With dexP+dex+tric it becomes a meager 10ish per tick, but an inevitable 10 per tick as they are literally now full of every oxyloss removing drug in the game. So you can survive a couple of minutes, max, with not enough blood. You're still paralyzed and eye_blurry for most of it. You should probably be in surgery.
2017-03-01 15:59:11 -05: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
Cameron653
65b21ddbe5 Gives not equal gate the correct icon_state
Gives the not equal gate a correct icon_state. Icon state was set to"not equal"

 In the electronic_assemblies.dmi it is actually "not_equal"

This gives it the correct icon_state
2017-02-27 18:11:38 -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
Yoshax
ead56a1776 Fixes a loadout issue 2017-02-26 14:28:44 +00:00
nachomeep
ef7be38ed4 Fixes hoods.
CLIPPING ERROR DETECTED
2017-02-26 09:17:03 -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
Leshana
860a994818 Finally fixes the autolathe/protolate lid animations.
* Protolate lid no longer bounces back and forth througout the whole build cycle.
* Autolathe lid no longer closes, snaps open, and then -nothing- until item spawns.
* Instead, the lid closes, stays closed while the item builds, then opens again.
2017-02-24 21:30:57 -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
4369e49def Merge pull request #3007 from Leshana/pacman-construction-fix
Fix construction and deconstrution of PACMANs
2017-02-24 18:29:33 -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
Leshana
de85e27e25 Fix construction and deconstrution of PACMANs
* Modernized to use modern machine code instead of doing it itself.
* Made it compatible with modern circuits and machine frames.
* Also fixed some color macros to use CSS while I was there.
2017-02-22 10:32:27 -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