mwerezak
e2b4e43a9c
Fixes suits being punctured by projectiles when...
...
...fully blocked by a shield.
Conflicts:
code/modules/mob/living/carbon/human/human_defense.dm
2014-07-16 09:36:50 -04:00
Neerti
dd6f54ed47
fun fact: This took 6 hours because bay uses different say().
...
fun fact: I'm never porting say-related stuff from bay.
Conflicts:
code/game/objects/items/devices/radio/encryptionkey.dm
code/game/objects/items/devices/radio/headset.dm
code/modules/mob/living/say.dm
code/modules/mob/living/silicon/ai/ai.dm
2014-07-16 09:27:12 -04:00
ZomgPonies
aafa11712a
Removal of virus1/disease1 system. So long GBS/Jungle Fever, you'll be missed!
2014-07-16 00:53:08 -04:00
ZomgPonies
ccb425bd44
Preperation for spell action buttons
2014-07-15 11:20:43 -04:00
ZomgPonies
88098da3c7
Object verb removal crew
2014-07-15 08:47:43 -04:00
Kelenius
c54b9e3626
Slime update
...
Conflicts:
baystation12.dme
code/modules/mob/living/carbon/metroid/death.dm
code/modules/mob/living/carbon/metroid/metroid.dm
code/modules/mob/living/say.dm
code/modules/mob/transform_procs.dm
code/modules/reagents/Chemistry-Recipes.dm
maps/tgstation2.dmm
2014-07-15 00:50:41 -04:00
Zuhayr
938dc70803
Fixes #5485
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2014-07-14 03:31:51 -04:00
Zuhayr
4bda0095ca
Fixes #5531
2014-07-14 03:27:15 -04:00
Zuhayr
9d3d1c9ea1
Fixes #5508
...
Conflicts:
code/modules/organs/organ_external.dm
2014-07-14 03:26:56 -04:00
Zuhayr
c91d3895f9
Fixes #5573
2014-07-14 03:23:53 -04:00
d3athrow
6a61b78d98
Spacepod enhancements
...
Added damage to spacepods as well as damage overlays.
Started a framework to allow more than 1 weapon system per spacepod.
Pods turn into fireworks when they reach 0 integrity.
Conflicts:
code/WorkInProgress/pomf/spacepods/spacepods.dm
html/changelog.html
2014-07-13 16:05:53 -04:00
Kelenius
a552662bec
Now uses isturf
2014-07-13 15:21:12 -04:00
Kelenius
a0609d0ce7
Two fixes
...
Double click made non-snowflake, cancel camera exploit patched
2014-07-13 15:20:53 -04:00
Kelenius
b6c6138c44
Gives the AI a hud
...
Conflicts:
code/_onclick/hud/_defines.dm
code/_onclick/hud/other_mobs.dm
code/_onclick/hud/screen_objects.dm
code/game/objects/items/devices/PDA/PDA.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/mob/living/silicon/ai/say.dm
code/modules/paperwork/photography.dm
2014-07-13 15:20:08 -04:00
Walter0o
800169feab
adjusts examine for w_class 1 yankability
...
Conflicts:
code/modules/mob/living/carbon/human/examine.dm
2014-07-13 09:02:33 -04:00
ZomgPonies
b0edf2cc0b
Small fix
2014-07-13 09:01:47 -04:00
Walter0o
e5cb01f6fb
shrapnel check for human get_visible_implants()
2014-07-13 08:59:51 -04:00
mwerezak
44e2f8acf2
Fixes human internal organs list
...
Conflicts:
code/modules/events/organ_failure.dm
code/modules/organs/blood.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/surgery/ribcage.dm
2014-07-13 08:51:55 -04:00
Chinsky
0df1dabf75
Adds overmap system and examples of it's usage.
...
Unticked, as it disables space edge transition.
Conflicts:
code/modules/mob/mob_movement.dm
2014-07-13 08:21:26 -04:00
ZomgPonies
ffd2c1ce42
Minor change
2014-07-13 07:43:32 -04:00
Hubblenaut
aed68c1c2c
Fixes canmove updating wrongly on movable chairs
...
Conflicts:
code/modules/mob/mob.dm
2014-07-13 07:27:47 -04:00
ZomgPonies
2bb72d378b
Movement fix
2014-07-13 07:06:11 -04:00
Hubblenaut
4375357b23
Fixes wrong person getting movement penalty
2014-07-13 06:56:06 -04:00
Hubblenaut
740c54328b
Minor code cleanup
...
Conflicts:
code/modules/mob/mob_movement.dm
2014-07-13 06:55:47 -04:00
Hubblenaut
6c0122e7d6
Fixes in wheelchair and different handling of movement
...
Conflicts:
code/game/objects/structures/stool_bed_chair_nest/bed.dm
code/modules/mob/mob.dm
2014-07-13 06:52:38 -04:00
Walter0o
895302e28a
fixes weird drone health status
...
a non-damaged drone has 35 health and 35 maxHealth.
in the current proc, that is shown as (( 35 +35)/(35*2))*100 = 100 % health
a drone at half its health has 17.5 health.
current proc : (( 17.5 +35)/(35*2))*100 = 75 % health
a dead drone has 0 health.
current proc : ( 0 +35)/(35*2))*100 = 50 % health
as i fixed this proc in the silicon parent proc, this can be removed.
2014-07-13 06:33:35 -04:00
Walter0o
d4f503c6f8
fixes weird silicon health status
...
a non-damaged cyborg has 200 health.
in the current proc, that is shown as (200+100)/2 = 150 % health
a dead borg has 0 health.
in the current proc, that is shown as (0+100)/2 = 50 % health
Conflicts:
code/modules/mob/living/silicon/silicon.dm
2014-07-13 06:32:59 -04:00
mwerezak
119106488b
Readds check for sharp && !ismob(W.loc)
2014-07-13 06:13:54 -04:00
mwerezak
3bf0011405
Fixes #5446
...
Conflicts:
code/modules/mob/living/silicon/robot/robot_modules.dm
2014-07-13 06:13:46 -04:00
Zuhayr
5c6cfffaf8
Fixed embedding.
...
Conflicts:
code/modules/mob/living/carbon/human/human_damage.dm
2014-07-13 06:11:20 -04:00
mwerezak
3f7a6286b8
Improves the display of shuttle ETAs
...
Conflicts:
code/controllers/emergency_shuttle_controller.dm
2014-07-13 06:09:33 -04:00
Zuhayr
a07cd1f361
Fixes #5446
2014-07-13 05:44:17 -04:00
Zuhayr
8d6bf2a6c9
Fixes #5448
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
2014-07-13 05:43:18 -04:00
ZomgPonies
92940e1c00
Running tests and cleaning out useless debug verbs/procs.
2014-07-13 05:32:40 -04:00
Zuhayr
d85226b279
Fixes #5090
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
2014-07-12 22:08:15 -04:00
Zuhayr
661f4002a9
Fixes #5113
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
2014-07-12 22:06:16 -04:00
Zuhayr
b8e3d45671
Cleaned up some reagent stuff, made Skrell alcoholics a legit issue, fixed IPC getting phoron contamination from clothing.
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/species.dm
code/modules/reagents/Chemistry-Reagents.dm
code/setup.dm
2014-07-12 21:58:54 -04:00
Zuhayr
05e4a50b92
Fixed embedding.
...
Conflicts:
code/modules/organs/organ_external.dm
2014-07-12 21:42:15 -04:00
mwerezak
b3742982bb
Fixes #5336
...
Conflicts:
code/modules/mob/living/carbon/human/human_defense.dm
2014-07-12 21:32:16 -04:00
ZomgPonies
ab32000c2a
Finally fixes lobby jukebox
2014-06-29 16:44:42 -04:00
Zuhayr
d214fe68cc
Added better checks to leap(), prevented leap spamming (hopefully).
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
2014-06-29 12:01:13 -04:00
ZomgPonies
399e4909d6
The death of assistants. Long live civilians!
2014-06-27 17:57:18 -04:00
ZomgPonies
90377dcec0
Merge pull request #285 from Regen1/leap-nerf
...
Vox leap nerf
2014-06-27 11:53:33 -04:00
Regen
1f0509c7b0
Vox leap nerf
...
Now they can't leap while handcuffed
2014-06-27 17:42:33 +02:00
Zuhayr
64aa4104fc
Fixed an oversight with RAD_ABSORB and collapsing.
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2014-06-26 22:00:52 -04:00
ZomgPonies
cb9b6fca4d
Replacing civilian with support department. Still need to make changes on MySQL schema.
2014-06-26 19:42:14 -04:00
Bram961
32db2665a4
Permanent brain exposure fix
...
A fix too the permanent brain exposure glitch, now brain exposure can be
fixed by setting the skull
2014-06-26 12:13:01 +02:00
ZomgPonies
adfa2ca902
And another one, I'll remove them one by one until I find the one that works.
2014-06-25 13:21:09 -04:00
ZomgPonies
23d6889a28
Trying to fix lobby jukebox
2014-06-25 13:19:56 -04:00
ikarrus
73cc0fca34
-Securitrons will declare the threatlevel of the perp when making an arrest/detention
...
-emagging will turn declarations off
-People with criminal status "Incarcerated" or "Parolled" will increase threatlevel
Conflicts:
code/game/machinery/bots/ed209bot.dm
code/game/machinery/bots/secbot.dm
2014-06-25 09:32:44 -04:00
