cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-19 14:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,404 Commits 27 Branches 2 Tags
740c54328bdf4fdc8275563a09bc56c5bc626cab
Commit Graph

7668 Commits

Author SHA1 Message Date
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
paprka
2c36c85729 added empty gun noises 
Conflicts:
	code/modules/projectiles/gun.dm
 2014-06-29 16:43:56 -04:00
mwerezak
11dc8b9a1f Fixes escape shuttle requiring authorization after countdown has finished 2014-06-29 12:08:43 -04:00
mwerezak
2242658936 Fixes shuttles getting stuck when cancelling launch 2014-06-29 12:07:39 -04:00
mwerezak
117221b0d5 Adds the ability to force launch escape pods 
Also reduces their countdown from 15 to 10 seconds.

Conflicts:
	maps/tgstation2.dmm
 2014-06-29 12:07:13 -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
Zuhayr
28a1e35f80 As far as I can tell, viral infections were happening irrespec 
tive of medical crew being present. Lowered chance for proc as well.

Conflicts:
	code/modules/events/event_dynamic.dm
 2014-06-26 21:58:46 -04:00
mwerezak
9079bb353e Improves the fix for shuttles being stuck if... 
... the docking controller is destroyed.
 2014-06-26 21:19:13 -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
mwerezak
d2837379d4 Fixes ERT shuttle not announcing a cancelled... 
...launch if the launch is cancelled after the countdown is completed.
 2014-06-26 18:23:55 -04:00
mwerezak
f5f4682b8e Updates secrets panel to use the new shuttle... 
...datum correctly.

Conflicts:
	code/modules/admin/admin.dm
 2014-06-26 16:58:07 -04:00
mwerezak
05c5f81b97 Fixes base shuttle console requiring engine access 2014-06-26 16:53:32 -04:00
mwerezak
38bf6b59c4 Fixes shuttles getting stuck if the docking... 
...controller they are trying to dock with has been destroyed or is not
responding.
 2014-06-26 16:53:11 -04:00
Necaladun
ce4066c936 Minor map tweaks and NGS-> NCS 2014-06-27 05:30:52 +09:30
Regen
38171314e9 Comment out Spider virus effect 2014-06-26 21:22:01 +02:00
ZomgPonies
64023f1260 Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-26 08:07:49 -04:00
mwerezak
1284dc85c5 Fixes shuttle consoles not checking access 
Generalizes machine access.
 2014-06-26 07:40:51 -04:00
mwerezak
59fd7a1f18 Adds escape pod docking controller type 
Escape pods now no longer launch automatically during regular crew
transfers. However they can be set to launch during a regular crew
transfer by emagging the escape pod controller.

Also fixes emergency shuttle arrival announcement having the wrong ETD.

Conflicts:
	code/controllers/emergency_shuttle_controller.dm
	maps/tgstation2.dmm
 2014-06-26 07:40:15 -04:00
mwerezak
b39093732b Fix for long_jumps never leaving transition area 
The previous behaviour of move() called without arguments assumed a
short_jump, which meant that the wrong origin area would be used.
 2014-06-26 07:34:32 -04:00