Commit Graph

17074 Commits

Author SHA1 Message Date
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
ZomgPonies 8f0e56f4fa 3d sound fixes 2014-07-13 07:19:24 -04:00
DJSnapshot 656eddf60d volume fallout over distance to make it even better.
Conflicts:
	code/game/sound.dm
2014-07-13 07:16:00 -04:00
DJSnapshot a305c88276 3D EAX Environmental sound 2014-07-13 07:15:01 -04:00
John-Michael O'Brien 1e6963f1c8 Update PDA.dm
Patched the comment to match the actual, final behavior (Doh!)
2014-07-13 07:14:01 -04:00
JimTheCactus 6c7ab75146 Patched PDA scanner to be more useful
PDA's integrated scanner was VERY rudimentary. Patched it to resolve
some formatting issues and improve usability.
2014-07-13 07:13:45 -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 8459ed1b52 Fixes #5459
Conflicts:
	code/game/machinery/embedded_controller/docking_program.dm
2014-07-13 07:12:01 -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
Walter0o 172821f86d fixes computers eating cards
this commit :
https://github.com/Baystation12/Baystation12/commit/ea1060ac339c4b4ef1692f446865926cf262dd68

added in machinery's attack_hand() proc, line 238
```
if(!allowed(user))
		user << "\red Access Denied."
		return 1
```

to almost all machinery including computers, since they call this proc via their attack_hand() procs.

allowed(user), see access.dm line 94, in turn only checks the user's hand and wear_id,
NOT the card inside the machine,
as different machines have different vars and systems handling how they can be accessed.

instead of fixing the underlying problem, eject card verbs were added like this one :
https://github.com/Baystation12/Baystation12/commit/30385c22371a4e47ac43eac2fc953f7f8854fad4

this PR reverts that nonsense machinery addition and adds the shuttle_control access check where it belongs.
Conflicts:
	code/game/machinery/machinery.dm
2014-07-13 07:09:01 -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
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