mwerezak
044399e6f0
Required spaceacillin levels no longer scale
...
The amount of spaceacillin required to stop infections is now a flat 5
units, instead of scaling with germ_level.
2014-07-13 07:43:57 -04:00
ZomgPonies
ffd2c1ce42
Minor change
2014-07-13 07:43:32 -04:00
mwerezak
54075aaceb
Infected wounds show up more readily on the health scanner
2014-07-13 07:42:32 -04:00
mwerezak
0682d336ec
Spaceacillin now prevents wounds from transferring germs
2014-07-13 07:42:21 -04:00
mwerezak
cf52f9e734
Fixes reagent_containers not being usable for surgery
2014-07-13 07:42:10 -04:00
mwerezak
9cebb9708e
Makes bleeding logic a little clearer
2014-07-13 07:41:56 -04:00
mwerezak
26f1173765
Allows necrosis to be fixed with peridaxon and surgery
...
Conflicts:
code/modules/surgery/headreattach.dm
2014-07-13 07:41:24 -04:00
mwerezak
8f6bfb8b1a
Reduces amount of toxin damage dealt by infections
...
Reduces the toxin damage dealt by non-necrotic infections by a factor of
1.5. Also increases the germ_level required to reach necrosis.
Conflicts:
code/modules/organs/organ_internal.dm
code/setup.dm
2014-07-13 07:39:26 -04:00
mwerezak
e360e5732b
Adjusts the curing of infections
...
Conflicts:
code/modules/organs/organ_internal.dm
2014-07-13 07:36:25 -04:00
mwerezak
0ba5e1a3dc
Fixes dionaea getting infections
2014-07-13 07:35:30 -04:00
mwerezak
5a054bcdaa
Makes infections cure faster
2014-07-13 07:35:17 -04:00
ZomgPonies
ca667bae0a
Fuck Phoron
2014-07-13 07:31:09 -04:00
mwerezak
f42244730b
Removes duplicate defines, updates comments
...
Conflicts:
code/game/machinery/embedded_controller/docking_program.dm
2014-07-13 07:30:39 -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
GinjaNinja32
56615e9170
Fix Change UI verb
2014-07-13 07:13:10 -04:00
mwerezak
e0afb0632b
Shuttle now can only be late when arriving
2014-07-13 07:12:30 -04:00
mwerezak
b3ce8db989
Fixes shuttle being late AFTER it arrives
2014-07-13 07:12:16 -04:00
mwerezak
908cabea09
Fixes the supply shutting being stuck in warmup if forbidden atoms are aboard
...
Might be related to #5459 , not sure though.
2014-07-13 07:10:01 -04:00
Walter0o
2a3bfa443d
adds shuttle_control access check to proper place
2014-07-13 07:09:09 -04:00
ZomgPonies
2bb72d378b
Movement fix
2014-07-13 07:06:11 -04:00
Mark Aherne
99eb85fae4
This change to nanomanager optimizes the sending of nanoui assets to clients.
...
The flist (file list) proc was being used multiple times for each client user logon, this now only occurs once when the server starts.
Hopefully this fixes the nanoui assets issue which occurs during peak usage.
Conflicts:
code/modules/nano/nanomanager.dm
2014-07-13 07:04:09 -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
Hubblenaut
b9be3e6ed7
Stops buckled mobs from slipping (for now)
...
Conflicts:
code/game/turfs/simulated.dm
2014-07-13 06:48:17 -04:00
Zuhayr
6e9f55f262
Fixes #5472
2014-07-13 06:34:37 -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
4f4b96d5b1
Fixes bad emergency shuttle can_force() check
2014-07-13 06:27:45 -04:00
mwerezak
cf05d11854
Status displays now won't blank when undocking, too
2014-07-13 06:27:31 -04:00
mwerezak
f0f6ce06f2
Makes the escape shuttle NanoUI window bigger
2014-07-13 06:27:17 -04:00
mwerezak
fe40190870
Reduces docking timeout to 20 seconds
2014-07-13 06:25:27 -04:00
mwerezak
1ca6e41532
Fixes status displays blanking out when escape shuttle is about to launch
...
Conflicts:
code/controllers/emergency_shuttle_controller.dm
2014-07-13 06:25:10 -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
mwerezak
e368bd81a2
Resets emergency shuttle authorization on arrival
2014-07-13 06:05:51 -04:00
mwerezak
40c6508ccb
long_jump() now uses an arrive_time var instead of sleeping the whole time.
...
Makes ETAs more accurate, allows the possibility of interrupting
long_jumps in the future.
Conflicts:
code/modules/shuttles/shuttle.dm
2014-07-13 06:05:29 -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
9c0a28b9d3
Fixes #5410 and possibly #5399
2014-07-12 22:02:35 -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
Robson Richards
9771111a5f
Narsie now plays an Animation when it spawns in, Text and Gender set to NEUTER, DEBATE OVER.
...
Conflicts:
code/modules/power/singularity/singularity.dm
2014-06-29 16:44:21 -04:00
