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
EmperorJon
780d650f18
Merge pull request #1466 from Yoshax/chenogasm
...
Adds different colored cheongsams
2016-04-22 18:22:16 +01:00
Yoshax
f2fdbf2f6a
Organ/surgical changes/fixes
2016-04-22 17:55:16 +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
redstryker
d38049f338
Added /engineering to atmos coat path
2016-04-22 10:20:21 -04:00
redstryker
5c5fa5f853
Added /suit to paths
2016-04-22 10:15:14 -04:00
redstryker
61ab92c7f6
Adds all of the winter coats to the loadout.
2016-04-22 10:03:18 -04:00
HarpyEagle
03761c5eed
Compile fixes
2016-04-22 04:58:26 -04:00
HarpyEagle
5543209bbd
Fix macro
2016-04-22 04:58:25 -04:00
mwerezak
28192c6675
Adds cooldowns to eating/feeding, allows attacking with reagent containers while on harm intent.
2016-04-22 04:58:25 -04: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
c0ac25ec4b
Refactors robolimb emagging, fixes emag resolve_attackby not passing emag_source
2016-04-22 04:57:23 -04:00
mwerezak
d4cbc49132
Prevents attacking yourself with items unless on harm intent
2016-04-22 04:57:22 -04:00
mwerezak
3c22e65399
Adds some documentation to item_attack.dm
2016-04-22 04:57:22 -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
Nerezza
4c7537e180
Makes opening/closing pizza boxes easier
...
Alt-click now opens/closes pizza boxes like a laptop.
2016-04-21 21:43:32 -05:00
Neerti
069e9c7e68
Merge pull request #1470 from Hubblenaut/smes
...
Changes to SMES Interface
2016-04-21 21:09:42 -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
6d15cb3731
Merge pull request #1472 from Yoshax/paifix
...
Stops pAIs from dragging people, corpses, etc
2016-04-21 21:08:33 -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
78d8caed83
Stops pAIs from dragging people, corpses, etc
2016-04-22 01:33:25 +01:00
Yoshax
0353ac2238
Makes cheongasm loadout selection clearer
2016-04-22 01:17:11 +01: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
Hubblenaut
3d9a558712
Changes to SMES
...
- Transition to using kilowatts and kilowatt hours
- Adds an input load bar with value
- SMES charge rate and coil capacities slightly adjusted for using
kilowatt units
2016-04-22 00:58:11 +02: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
c77a7d4c00
Makes cheongasms use fancy loadout tweak stuff
2016-04-21 22:29:30 +01:00
Datraen
4212acdc58
Makes slimes less annoying, xenos now translate messages.
...
Translation is as a result of say code being extra fun.
2016-04-21 16:40:59 -04:00
Yoshax
9e2119a873
Adds different colored cheongsams
2016-04-21 21:28:34 +01:00
Ccomp5950
574b08d703
Slimes and Parrots now hear_say
...
Removes the recursive bullshit that was put in living/say() that isn't needed.
Fixes #12063 http://i.imgur.com/lsb983N.png
2016-04-21 13:57:24 -04:00
Datraen
11a6e74ea9
Fix reagent handling, magic numbers, other errors.
2016-04-21 13:39:52 -04:00
Nerezza
42eaadb4e5
Skrell can speak Schechi instead of Teshari now
2016-04-21 12:02:35 -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
Datraen
f09304c508
Adds the new xeno mob system, implemented with slimes.
2016-04-21 11:05:18 -04:00
Kelenius
98badae45f
Merge branch 'master' into cleanupTwo
2016-04-21 11:41:32 +03:00
Anewbe
40ce9dc904
Gives Breacher helmets force 5, makes their headbutts more dangerous
2016-04-20 22:10:44 -05: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
Neerti
a1faf6e497
Merge pull request #1428 from ParadoxSpace/DionaLightFix
...
Fixes Diona Light Gain
2016-04-20 12:12:45 -04: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
Yoshax
0577738032
Character setup gender selection changes
...
Different species now have different gender selections available.
2016-04-20 16:27:55 +01:00
HarpyEagle
6b7d40b75f
Fixes confused movement for walking/running, adjusts behaviour
2016-04-20 16:49:33 +02:00
HarpyEagle
bf3253ca28
Running into things while confused Weakens instead of Paralyzes.
...
Fixes incorrect use of take_organ_damage
2016-04-20 16:49:14 +02:00
Yoshax
26192e2b32
Fixes an error
2016-04-20 15:36:13 +01:00