Commit Graph

13354 Commits

Author SHA1 Message Date
Hubblenaut
3345e0fede Fixes teleporting while buckled 2014-07-13 06:47:28 -04:00
ZomgPonies
9b1247a21c Fixes blood on wheelchair 2014-07-13 06:47:05 -04:00
Hubblenaut
8a0e43ae1e Turns movable chairs on click 2014-07-13 06:37:38 -04:00
Zuhayr
6e9f55f262 Fixes #5472 2014-07-13 06:34:37 -04:00
Zuhayr
b3fc3a4a15 Fucking Hell I'm an idiot. 2014-07-13 06:34:22 -04:00
unknown
7afc2a50d4 Makes the cargo console force launch command more obvious 2014-07-13 06:34:06 -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
e8b9375887 Allows escape pods to be armed from inside the pod
Conflicts:
	code/game/machinery/embedded_controller/simple_docking_controller.dm
2014-07-13 06:27:01 -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
Zuhayr
0266582acb Missed a linebreak. 2014-07-13 06:22:39 -04:00
Zuhayr
197fc0c36c Cleans up some of the lore issues with Mutiny.
Conflicts:
	code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
2014-07-13 06:22:30 -04:00
Zuhayr
1b1961b4fd Changed Mutiny messages to use the existing Centcomm message format.
Conflicts:
	code/game/gamemodes/mutiny/mutiny.dm
2014-07-13 06:21: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
Chinsky
6ce2d8a0f8 Fixed #5374
Also added cancellation buttons here and there.
Prevented an exploit, resulting in ability to issue same passes with different ID, even if it doesn't have those accesses.

Conflicts:
	code/WorkInProgress/Chinsky/guestpass.dm
	icons/obj/computer.dmi
2014-07-13 05:57:37 -04:00
mwerezak
7e64846a95 Improves suit cooler
Adds a few vars items should have, e.g. throwforce, flags, etc. Also
origin_tech.
2014-07-13 05:54:02 -04:00
Zuhayr
b148235669 Wtf how did this line even get deleted. 2014-07-13 05:47:38 -04:00
Zuhayr
fe1cf5ef77 Oversight with table fix. 2014-07-13 05:47:21 -04:00
Zuhayr
3f5b842405 Fixes guest terminals only allowing 29 minute passes.
Conflicts:
	code/WorkInProgress/Chinsky/guestpass.dm
2014-07-13 05:47:13 -04:00
Zuhayr
92192021af Compile fix. 2014-07-13 05:45:43 -04:00
Zuhayr
02a7109037 Fixes #5434 2014-07-13 05:45:23 -04:00
Zuhayr
1d06e2ac6e Fixes #5450 2014-07-13 05:45:12 -04:00
Zuhayr
a07cd1f361 Fixes #5446 2014-07-13 05:44:17 -04:00
Zuhayr
03ca219356 Fixes #5443 2014-07-13 05:43:53 -04:00
Zuhayr
8d6bf2a6c9 Fixes #5448
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2014-07-13 05:43:18 -04:00
Mloc-Argent
f747b1e767 lighting: fix + optimize colored lights
turfs now directly hold color lumcounts
overlay is averaged + rounded from that instead of strings
overall colored lumcount is now rounded properly
fixes having thousands of lighting subareas after a fire
fixes #5417

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-07-13 05:33:10 -04:00
ZomgPonies
92940e1c00 Running tests and cleaning out useless debug verbs/procs. 2014-07-13 05:32:40 -04:00
Mloc-Argent
36754fb1dc helpers: fix move_contents_to() not moving air
fixes #5232

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-07-12 22:14:51 -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
d4b954ddc5 Fixes #5188
Conflicts:
	code/game/machinery/OpTable.dm
2014-07-12 22:03:55 -04:00
Zuhayr
9c0a28b9d3 Fixes #5410 and possibly #5399 2014-07-12 22:02:35 -04:00
Zuhayr
3ee3937bd8 Fixed lathes eating multitools and wirecutters when open.
Conflicts:
	code/game/machinery/autolathe.dm
2014-07-12 22:02:12 -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
Necaladun
ac95fb3c37 revert ducky crate
was replacing pizzas with this, and don't have the time atm to figure it
all out so revert
2014-07-01 08:40:40 +09:30
Zuhayr
9d96b16c74 Fixes an access issue with the ID computer. 2014-06-29 21:21:36 -04:00
ZomgPonies
1bab93f920 Fix serverstart crafting controller runtimes. 2014-06-29 16:44:51 -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