Commit Graph

7710 Commits

Author SHA1 Message Date
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
Walter0o
f5e1911a2e fixes #5449
missing variable updating lead to APCs stuck in green status during powersinks.
2014-07-13 08:59:25 -04:00
mwerezak
8ad91ea11c Fixes germ levels going below zero
Conflicts:
	code/modules/organs/organ_internal.dm
2014-07-13 08:53:53 -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
Zuhayr
1079661a1e Reapplied scanners to map, stopped braces working on drill turfs with no resources.
Conflicts:
	maps/tgstation2.dmm
2014-07-13 08:45:03 -04:00
Zuhayr
333c3c8ae7 Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs.
Conflicts:
	baystation12.dme
	code/modules/admin/admin_verbs.dm
	maps/tgstation2.dmm
2014-07-13 08:44:47 -04:00
Hubblenaut
956706c7cf Fix: Painkillers stay in body for decent time
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
2014-07-13 08:34:30 -04:00
Hubblenaut
776369d9ee Health Analyzer can read all types of beneficial medicine
Conflicts:
	code/game/objects/items/devices/scanners.dm
	code/modules/reagents/Chemistry-Reagents.dm
2014-07-13 08:32:14 -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
mwerezak
76e9212ac8 Fixed wrong operator 2014-07-13 08:19:59 -04:00
mwerezak
2ff4a975f0 Sterilizine reduces germ_level on contact
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
2014-07-13 08:19:50 -04:00
mwerezak
87e7c32959 Fixes advanced trauma kits claiming to disinfect but not doing so
Conflicts:
	code/game/objects/items/stacks/medical.dm
2014-07-13 08:18:16 -04:00
unknown
9a6e39fc58 Fixes missing length check before pick() 2014-07-13 08:17:03 -04:00
mwerezak
d3cdb25ef3 Increases cough rate for lung infections 2014-07-13 08:16:49 -04:00
mwerezak
ebfbf40724 Tweaks internal organ spread rate
Conflicts:
	code/modules/organs/organ_internal.dm
2014-07-13 08:16:32 -04:00
mwerezak
afaf623376 Makes minor wounds harder to infect 2014-07-13 08:13:21 -04:00
mwerezak
64ba9ab933 Fixes #5532 and increases the time required for organs to become infected from wounds
Also removes the now unnecessary get_cure_threshold() proc, caps the
rate at which an organ can receive germs from wounds, and makes germs
spread from external to internal organs happen one organ at a time
instead of all at once.

Conflicts:
	code/modules/organs/organ_internal.dm
	code/setup.dm
2014-07-13 08:13:02 -04:00
ZomgPonies
76276ace29 Cleaning out old unused code. 2014-07-13 08:10:44 -04:00
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