Commit Graph

11859 Commits

Author SHA1 Message Date
Yoshax
72ece69850 Moves double barreled out of the secondary list and into the main 2016-04-27 23:54:03 +01:00
Mark9013100
b8df470125 Punctuation fixes: Cult edition 2016-04-27 16:08:18 -04:00
Yoshax
4eabbcc8d1 Adjusts the equip proc to be better 2016-04-27 17:32:12 +01:00
Neerti
73c723c8d4 Merge pull request #1469 from Nerezza/DefaultCoolerCell
Upgrades default suit cooler cell
2016-04-25 14:36:48 -04:00
Hubblenaut
c61053d432 Morgue Trays interface with occupant minds 2016-04-25 20:10:43 +02:00
HarpyEagle
3ae1f9ed78 Updates more instances of blocked<2 or /=(blocked+1)
Removes facehugger source code file
2016-04-22 21:04:31 -04:00
Jon
b779f721ae Moves antag text to antag levels. Changes renegade text from default to make it clear they're minor antagonists meant to resist the major ones. Changes ERT text to make it clear they're not antagonists (not that anyone ever comments on it, but that is what it says)... 2016-04-23 00:06:30 +01:00
Yoshax
d2683a3f0b Removes auto-shotty from renegades list 2016-04-22 19:21:02 +01:00
Chinsky
e12e9300fa Adds new type of wounds - piercing.
Unlike cuts they do not merge, so many small-damage stabs will create many small stab wounds instead of one megahole.
Also cleans up checks in wound code a bit with power of OOP
2016-04-22 19:00:17 +01:00
Yoshax
2c27ad3494 Doubles medical stack amount to balance stack amount 2016-04-22 18:58:54 +01:00
Hubblenaut
c9df1c6985 Bruise packs are used per wound and take time to apply 2016-04-22 18:46:41 +01:00
Yoshax
944bd3f5bb Adjusts renagade gun list and spawns the gun in a bag if one exists 2016-04-22 16:19:47 +01:00
mwerezak
4951790b50 Fixes missing cooldowns, missing cult blade sound.
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
2016-04-22 04:58:25 -04:00
mwerezak
deb215d262 Refactors bottle smashing, apply_hit_effect() now returns the blocked status.
Conflicts:
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
2016-04-22 04:57:23 -04:00
mwerezak
9ef3df66e3 Fixes missing ..() 2016-04-22 04:57:23 -04:00
mwerezak
11c5b10bb9 Refactors various item attack() implementations
Replaced some attack() overrides with apply_hit_effect() or other attack
procs where appropriate.
Removed the attack() override from reagent_containers.

Conflicts:
	code/game/objects/items/weapons/clown_items.dm
	code/game/objects/items/weapons/material/kitchen.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/xenomorphs/alien_facehugger.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
2016-04-22 04:57:22 -04:00
mwerezak
593f7699db Refactors item_attack.dm
Refactors and cleans up item_attack.dm and related mob attack code

Conflicts:
	code/_onclick/item_attack.dm
	code/game/objects/items.dm
	code/modules/mob/living/bot/bot.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/living_defense.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
2016-04-22 04:52:04 -04:00
Neerti
7c0973a44b Merge pull request #1471 from Yoshax/ivfix
Adds a check to ensure only living mobs can attach and detach IVs
2016-04-21 21:08:45 -04:00
Neerti
554adc1743 Merge pull request #1467 from Nerezza/ParaDuffels
Adds EMT Duffelbags
2016-04-21 21:08:19 -04:00
Neerti
114a3e38bc Merge pull request #1463 from Yoshax/storagefixes
Normalises medical item storage size + fixes
2016-04-21 21:07:34 -04:00
Neerti
2a946fc23d Merge pull request #1243 from Kelenius/cleanupTwo
Mob inventory cleanup, part 2
2016-04-21 21:07:22 -04:00
Yoshax
81dfe5d9c2 Adds a check to ensure only living mobs can attach and detach IVs 2016-04-22 01:15:07 +01:00
Nerezza
4618c49793 Upgrades default suit cooler cell
Considering suit coolers are dedicated EVA equipment instead of emergency equipment, it's strange that they come equipped with a cell that lasts a handful of minutes in operation instead of a duration more comparable to an oxygen tank's.

This upgrades their default cell so that FBPs can grab, combine, and go just like other crewmembers.
2016-04-21 18:25:44 -05:00
Nerezza
983aa8cf56 Wizard Federation Redacted
What illuminati?
2016-04-21 18:05:09 -05:00
Nerezza
24cd704115 Adds EMT Duffelbags
Sprites EMT variation of medical duffels and places them into the bottom of their locker.
2016-04-21 16:37:43 -05:00
Yoshax
0a249df22e Normalises medical item storage size + fixes
Makes all first aid kits the same size,
Fixes pill bottles not holding 14 pills,
Fixes antag surigcal kit not holding all the items.

Adds a max weight class of 1 to pill bottles

Properly adjusts antag surgical kit size
2016-04-21 16:15:45 +01:00
Kelenius
98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
Yoshax
aa592e3b35 Gender tweaking
Limits biolgical gender by species and defaults to male/female.
Can also set gender identity which determines which is displayed upon examination and suchlike along with being shown in medical records
2016-04-20 20:07:14 +01:00
Datraen
2b53efdfd5 Merge pull request #1303 from Hubblenaut/hydro
Full fertilizer bottles of type glass/bottle
2016-04-20 11:31:31 -04:00
EmperorJon
89d5175e12 Merge pull request #1438 from Datraen/GameModes2
Adds three new mixed modes.
2016-04-20 13:21:31 +01:00
Neerti
3c92193bf5 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 3/30/2016_dumb_gun_balance
# Conflicts resolved:
#	code/modules/projectiles/projectile/beams.dm
2016-04-20 05:41:36 -04:00
Datraen
c24ba09834 Bumps up MercenaryRenegade gamemode requirement. 2016-04-19 13:05:05 -04:00
EmperorJon
28ab131610 Merge pull request #1441 from Yoshax/clickcooldownfix
Adds click cooldowns for attacking non-mob atoms for various mob types +other
2016-04-19 17:58:03 +01:00
Yoshax
a77d9269b0 Reduces table climbing time by one third 2016-04-18 18:29:03 +01:00
HarpyEagle
5faf635fae Adds click cooldown for certain cleanables 2016-04-18 15:27:12 +01:00
Datraen
a681213a02 Adds three new mixed modes! 2016-04-17 22:53:24 -04:00
Neerti
a1ae964c16 Merge pull request #1436 from Datraen/GuestPassOnTopic
Adds an access check to Guest Pass Terminals
2016-04-17 20:41:17 -04:00
Neerti
170fafcec7 Merge pull request #1432 from ParadoxSpace/FixesCult
Fixes Astral Journey Completely Destroying You
2016-04-17 20:41:05 -04:00
Datraen
bdcc36d8f0 Adds a check to the guest pass terminals to help prevent topic manipulation. 2016-04-17 18:00:04 -04:00
ParadoxSpace
5704a44bf8 saves us all
blessed be
2016-04-17 13:52:41 -06:00
Neerti
69a4242b17 Inventory Tweaks 1
Evidence bags should no longer start empty.
Reduces maximum width for the inventory background slightly.
Makes a new, slimmer to close the inventory.  This and the maximum width reduction mean the inventory should never overlap with other UI buttons.
2016-04-16 10:28:14 -04:00
EmperorJon
482316ed55 Merge pull request #1368 from Neerti/4/6/2016_new_inventory_port
Ports Bay's new inventory system.
2016-04-16 02:58:07 +01:00
Mark9013100
2accd60a5b Moves detective clothing from the cabinet to wardrobe 2016-04-15 13:27:28 -04:00
Datraen
a287d8b657 Merge pull request #1390 from Anewbe/Cryosleep
Shortens cryosleep timer
2016-04-15 11:16:20 -04:00
Hubblenaut
e41ad0c946 Reinforced Walls
Lowers amount needed for building a reinforced wall from a girder from
four to two sheets.
Gets rid of rod products from dismantling a reinforced wall.
Adds one more extra step for undoing the deconstruction.
2016-04-15 16:41:33 +02:00
Jon
931719b336 Removes traitor check 2016-04-12 02:20:28 +01:00
Jon
327d4ba11b Fixes lockdown for Autotraitor synths. 2016-04-12 00:29:13 +01:00
Jon
2389b1d997 Part 1 of a lockdown fix.
Borgs now show the correct operational status/lock-unlock button in the UI.
Autotraitor borgs can still be locked down. This doesn't fix that.
2016-04-11 23:22:38 +01:00
Datraen
3a363173f9 Merge pull request #1400 from Mark9013100/4/11/2016cyro_dump_fix
Fixes cryocells dumping patients out without being asked to
2016-04-11 15:38:53 -04:00
Mark9013100
4be2c28edb Fixes cryocells dumping patients out without being asked to 2016-04-11 12:48:26 -04:00