PsiOmegaDelta
d5c6d9c341
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-14 08:43:43 +02:00
PsiOmegaDelta
3a55b130a0
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
.travis.yml
code/modules/virus2/disease2.dm
maps/exodus-5.dmm
2015-08-14 08:34:42 +02:00
Chinsky
8c9d36e24a
Merge pull request #10197 from GinjaNinja32/gender
...
Changes gender-based words to use a datum list instead of switches.
2015-08-14 03:56:18 +03:00
Chinsky
94f0ceffe1
Merge pull request #10200 from mwerezak/gun-desc
...
Renames of various firearms (squashed version)
2015-08-14 03:55:43 +03:00
mwerezak
b5425e0bd9
Makes beer and ale bottles into actual bottles, adjusts bottle smashing
...
Generalizes opening drink containers, makes beer and ale bottles a subtype of bottle instead of can
Adjusts bottle smashing, duration, damage, and reliability.
2015-08-13 18:37:13 -04:00
mwerezak
c4ed6a10aa
Merge pull request #10609 from PsiOmegaDelta/150813-ReagentQdel
...
qdel(reagent) adjustments.
2015-08-13 12:35:08 -04:00
Chinsky
cce6c3ce2d
Merge pull request #10026 from Zuhayr/dronehats
...
Added hats for drones.
2015-08-13 17:49:03 +03:00
Zuhayr
cc340831e2
Merge pull request #10304 from GinjaNinja32/follow
...
Better follow code
2015-08-13 18:39:20 +09:30
PsiOmegaDelta
d1e8f670b2
qdel(reagent) adjustments.
...
Attempts to ensure qdel(reagents) only occur once per Destroy()
2015-08-13 10:26:31 +02:00
PsiOmegaDelta
62155433c2
Merge corrections.
...
Fixes the todo:s I claimed I'd fix at merge.
2015-08-13 10:17:03 +02:00
Zuhayr
4674333143
Minor holder refactor.
2015-08-13 17:31:42 +09:30
Zuhayr
ab49ac0d6d
Adds hats to dionaea.
2015-08-13 17:31:41 +09:30
Zuhayr
2f6a1f2830
Added hats for drones.
2015-08-13 17:31:40 +09:30
PsiOmegaDelta
e1db48e50f
Typo fix.
...
Minor typo fix: Unladed to unloaded.
2015-08-13 09:26:41 +02:00
PsiOmegaDelta
efef67a3e4
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-13 09:11:05 +02:00
PsiOmegaDelta
1b10f78940
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-08-13 09:01:10 +02:00
GinjaNinja32
b7964c2f4a
Missed a couple of t_ variables
2015-08-13 06:02:38 +01:00
GinjaNinja32
f52d48c91f
Merge remote-tracking branch 'upstream/dev' into follow
...
Conflicts:
.travis.yml
2015-08-13 05:54:30 +01:00
GinjaNinja32
cde0f889c7
Merge remote-tracking branch 'upstream/dev' into gender
...
Conflicts:
code/modules/mob/living/carbon/human/examine.dm
2015-08-13 05:52:51 +01:00
Chinsky
f7ccf47f06
Merge pull request #10030 from GinjaNinja32/languages
...
Reworks character creation language selection
2015-08-13 07:23:44 +03:00
Chinsky
89659c99fc
Merge pull request #10001 from PsiOmegaDelta/150702-MaskRefactor
...
Refactors mask voice changes.
2015-08-13 07:23:27 +03:00
GinjaNinja32
98c2a0c8b1
Merge pull request #10594 from mwerezak/embed-fix
...
Embedding and broken limb fixes
2015-08-13 04:52:20 +01:00
mwerezak
1dc853710c
Implant items do not count for continuing to process embedded objects
...
Also makes embedded pain messages respect NO_PAIN.
2015-08-12 23:38:44 -04:00
mwerezak
99e1d88285
Fixes #10592
...
Fixes the right hand being affected if the left arm was broken.
2015-08-12 22:41:30 -04:00
mwerezak
62ad3a7be4
Fixes #10593
...
Adds a embedded_needs_process() proc to determine if the mob has embedded objects that still need to be processed. The get_visible_implants() remains to determine which implants can be seen on examine and yanked out.
2015-08-12 22:24:14 -04:00
GinjaNinja32
792d6e2864
Merge pull request #10579 from mwerezak/misc
...
Fixes
2015-08-12 22:21:34 +01:00
HarpyEagle
74f9e6ce63
Fixes #10552
2015-08-12 16:45:45 -04:00
HarpyEagle
7a86d6e658
Fixes #10571
...
Adds another snowflake electronic item to the can_hold list.
2015-08-12 16:06:31 -04:00
PsiOmega
ba240cb768
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/antagonist/station/rogue_ai.dm
code/game/machinery/atmoalter/portable_atmospherics.dm
code/game/machinery/spaceheater.dm
code/modules/clothing/head/soft_caps.dm
maps/exodus-5.dmm
2015-08-12 21:18:18 +02:00
mwerezak
5b6c5ee5ce
Merge pull request #10570 from Zuhayr/master
...
Couple of fixes.
2015-08-12 15:00:36 -04:00
Zuhayr
9831aede3f
Fixes drone pulling.
2015-08-13 03:31:57 +09:30
PsiOmegaDelta
94e3fe6f5f
Merge pull request #10567 from mwerezak/fire-cooling-fix
...
Fixes carbon fire_act()
2015-08-12 19:54:42 +02:00
Chinsky
8c8c2bce85
Merge pull request #10503 from PsiOmegaDelta/150811-BorgSpawnRuntime
...
Fixes a borg spawn runtime.
2015-08-12 20:42:04 +03:00
HarpyEagle
1e8e0547e4
Fixes carbon fire_act()
...
Caused fire to actually cool down the mob if the mob was already hotter
than the exposed temperature.
2015-08-12 11:58:11 -04:00
Zuhayr
4db1a553f2
Merge pull request #10556 from PsiOmegaDelta/150812-Stripping
...
Adds sanity checks for stripping.
2015-08-13 00:39:41 +09:30
PsiOmegaDelta
67c79e7a1b
Adds sanity checks for stripping.
...
Mobs can no longer strip other mobs while prone, unconscious, or buckled down. Fixes #10553 .
2015-08-12 13:12:52 +02:00
PsiOmegaDelta
48d5e73729
Fixes an observer runtime.
2015-08-12 09:10:16 +02:00
PsiOmegaDelta
7031ff0b43
Fixes human spawn runtime.
...
Similar to #10503 .
2015-08-12 09:07:48 +02:00
PsiOmega
da6a3e98d8
Fixes a borg spawn runtime.
...
Adds client check to prevent null.statpanel runtime.
2015-08-12 08:04:11 +02:00
PsiOmegaDelta
163ac0de1e
Merge pull request #10521 from GinjaNinja32/mirror_gender
...
Mirrors no longer check the user's gender when finding the list of valid hairstyles
2015-08-12 06:26:45 +02:00
GinjaNinja32
41965d93ef
Mirrors no longer check the user's gender when finding the list of valid hairstyles
2015-08-12 01:00:43 +01:00
PsiOmega
e4f6436a85
Fixes #10494 .
...
Borgs have their very own custom little headset, so cute.
2015-08-11 21:11:16 +02:00
GinjaNinja32
ea76feb3cd
Compile fix
2015-08-11 18:47:25 +01:00
GinjaNinja32
631ff21980
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/runes.dm
code/game/objects/items/weapons/implants/implantcase.dm
code/game/objects/items/weapons/melee/energy.dm
code/modules/mob/living/carbon/human/emote.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/human_attackhand.dm
code/modules/mob/living/silicon/robot/drone/drone.dm
code/modules/mob/living/silicon/robot/emote.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/nano/modules/crew_monitor.dm
code/modules/organs/organ_internal.dm
2015-08-11 18:47:05 +01:00
Chinsky
7b1656f40c
Merge pull request #10470 from Karolis2011/dev-freeze
...
[Dev-Freeze] Replace \red with <span> in runes.dm, fix many "his/her/their" gender messages
2015-08-11 20:07:06 +03:00
Zuhayr
20e7ee0b71
Merge pull request #10111 from mwerezak/eye-attack
...
Makes grab eye attacking respect species lore better
2015-08-12 02:36:50 +09:30
PsiOmega
78ffb5835a
Misc.
2015-08-11 17:33:03 +02:00
SomeoneElse
8c0984d5b1
Fix gender issues, some typos from various files
2015-08-11 13:41:40 +03:00
PsiOmegaDelta
54162f1c7d
Merge remote-tracking branch 'upstream/dev-freeze' into 150702-SpellFixes
2015-08-11 12:20:54 +02:00
PsiOmega
2f4c71ddbc
Renames definition and compilation fix.
2015-08-10 18:00:50 +02:00
