cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-04-29 03:22:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 11 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

17074 Commits

Author SHA1 Message Date
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
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
mwerezak
34c3585d6d Fixes shuttle announcing arrival in 7 minutes. 
Conflicts:
	code/controllers/emergency_shuttle_controller.dm
 2014-06-29 12:06:45 -04:00
Zuhayr
baeb58afd5 Fixed moving between tables freely. 2014-06-29 12:04:47 -04:00
Zuhayr
e203cce645 Fixed It won't budge! from crates, added drag and drop for table climbing, added Adajcent check to table climbing. 
Conflicts:
	code/game/objects/structures.dm
 2014-06-29 12:03:39 -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
26321b62db No combat punch for non-lethal gygax 2014-06-29 11:58:59 -04:00
ZomgPonies
920750d8f5 Merge pull request #289 from Regen1/Small-changes 
+1 window crush
 2014-06-28 09:22:51 -04:00
Regen
d708eeec06 +1 window crush 
Added another layer of window crushing
For extra robust
 2014-06-28 15:20:17 +02:00
ZomgPonies
1103e5f5dc Oops 2014-06-27 18:24:07 -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
d3c35251bb Fixes macro escape slashes 
Derp.

Conflicts:
	code/controllers/shuttle_controller.dm
 2014-06-26 21:20:33 -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
ZomgPonies
7ab91efdff ERT shuttle fix 2014-06-26 18:44:45 -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
mwerezak
ebe81e4cfb Improves shuttle ETA calculation 2014-06-26 16:52:59 -04:00
Necaladun
ce4066c936 Minor map tweaks and NGS-> NCS 2014-06-27 05:30:52 +09:30
ZomgPonies
deebd7f37c Merge pull request #284 from Regen1/Fuck-Spider-virus 
Comment out Spider virus effect
 2014-06-26 15:23:15 -04:00
Regen
38171314e9 Comment out Spider virus effect 2014-06-26 21:22:01 +02:00
ZomgPonies
fab8d7234b Merge branch 'master' of https://github.com/ZomgPonies/Paradise 2014-06-26 15:13:27 -04:00