cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-01 21:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,539 Commits 2 Branches 1 Tag
9007aedf15e38a096e94e43f5d473ced1a49a042
Commit Graph

16539 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aryn
9007aedf15 Fixed an annoying bug with giving another player a flashlight, 
opened up at least 100 individual bugs where people kept setting
loc and expecting light updates to catch it.
 2014-03-18 22:12:23 -06:00
Aryn
7e08bca4ef One runtime fixed, other one didn't turn up. 
I put in some stuff for it to be easier to find if it does.
 2014-03-18 22:12:22 -06:00
Ccomp5950
d9885dac74 Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev-freeze 2014-03-18 19:47:09 -05:00
Ccomp5950
98fba3b6b0 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/mining/machine_processing.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/virus2/helpers.dm
 2014-03-18 19:44:19 -05:00
Ccomp5950
b05f4df282 Merge pull request #4602 from RKF45/mining 
Removal of plasma glass
 2014-03-18 14:37:16 -05:00
Mloc
79f1269c7b Merge pull request #4598 from MrLeebo/biogenerator-fixes 
Biogenerator fixes
 2014-03-18 17:21:46 +00:00
RKF45
ddb414d740 Removal of plasma glass 2014-03-17 20:37:10 +01:00
Mloc
83d028e394 Merge pull request #4588 from Ccomp5950/ore_process_optimize 
Code effeciency project:  Ore processing.
 2014-03-17 19:14:20 +00:00
Jeremy Liberman
38825a2ddc Reading comprehension fail 
Gave a better "already loaded" text to the bio-generator.
 2014-03-16 21:43:55 -05:00
Jeremy Liberman
31c79acd6e Fixes biogenerator typo, improper beaker splashing, and allows glass beakers to refill botany trays 2014-03-16 21:16:31 -05:00
Chinsky
b4ef26cef8 Merge pull request #4594 from Ccomp5950/pda_fix 
PDA NanoUI bugfix.
 2014-03-17 04:47:50 +04:00
Mloc
4d188806d7 Merge pull request #4587 from Vetinarix/dev 
Medbay: Scrubber Relocated
 2014-03-16 11:49:30 +00:00
Mloc
38c84de28b Merge pull request #4585 from Ccomp5950/hud-no-client 
HUD-Optimization bugfix, mobs with no clients will update their health
 2014-03-16 11:49:04 +00:00
Ccomp5950
6e56a81531 PDA NanoUI bugfix. 
modes that update every 5 ticks won't require clicking the pda 5 times to get a UI window open.

We now check to see if a UI already exists if not we don't check
 2014-03-16 04:07:46 -05:00
Ccomp5950
5e0730733f Merge pull request #4580 from Jarcolr/master 
Coin Flipping, AKA the D2
 2014-03-16 00:55:52 -05:00
Chinsky
30309d4432 Merge pull request #4593 from Segrain/master 
Smallfix.
 2014-03-16 08:24:48 +04:00
Segrain
89b55a335e Fix for #4592. 2014-03-16 08:17:18 +03:00
Chinsky
4ac6914c94 Merge pull request #4591 from Segrain/master 
Smallfix.
 2014-03-15 23:07:30 +04:00
Segrain
02cc696bf3 Fix for #4589. 2014-03-15 23:02:57 +03:00
Chinsky
08b9714573 Merge pull request #4590 from Mloc/bs12-magicalwindoors 
Fixes #4589
 2014-03-15 22:00:39 +04:00
Mloc-Argent
3d18b94d7d Fixes #4589 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-03-15 18:02:24 +00:00
Ccomp5950
31ed2999c5 Runtime fix on spawned mobs with no minds/client. 2014-03-15 06:31:53 -05:00
Ccomp5950
7ce4073135 Code effeciency project: Ore processing. 
Before:  The stacker and processor used del(item) to get rid of the items causing /obj/movable/del() to spike up and cause fun amounts of lag.  Also we have seperate variables for if a certain ore type is selected in the processing machine and the cooking portion of process() uses a huge string of if()'s which check 8 or so variables and is terrible and probably a pain in the ass should someone decide to later add ore types and recipes.

After:  We just set item.loc = null when it goes in the stacker of processor and garbage collection takes care of it within a tick.  Those different variables for ore selection are now just one variable which is a bitfield, much easier to read, much easier to expand upon.
 2014-03-15 04:05:56 -05:00
Vetinari
c614e51f9f Medbay: Scrubber Move 
Changed the location of a scrubber which was blocking vision of one of
the fancy new floor tile tags in Medbay.
 2014-03-15 20:03:15 +11:00
Ccomp5950
f1fdbb02c0 HUD-Optimization bugfix, mobs with no clients will update their health 
HUD image as well.
 2014-03-15 00:57:11 -05:00
Jarcolr
53d0fac4e3 Small tweak to coin flipping. 
Last one,I swear.
 2014-03-14 18:39:22 +02:00
Chinsky
ac683c07be Merge pull request #4581 from Ccomp5950/ai_apc_fix 
APC-Rewrite AI fix.
 2014-03-14 18:24:43 +04:00
Ccomp5950
0b49817d79 Merge pull request #4569 from comma/crabpack 
Crabpack
 2014-03-14 00:22:43 -05:00
Ccomp5950
285ed0546b Merge pull request #4567 from comma/virus-racism 
Virology shenanigans
 2014-03-14 00:22:19 -05:00
Ccomp5950
bd483cc072 APC-Rewrite AI fix. 
Before:  AI's on new APC system would constantly add more and more power usage to the APC

After:   AI's no longer handle their power consumption, that has been pushed off to an /obj/machinery/ai_powersupply dummy object which will process the power usage.  This is much cleaner because machinery objects are already processed properly for the new system and keeps us from having to rewrite a bunch of AI code to bring the AI in line with how the new APC system works.
 2014-03-13 21:49:03 -05:00
Jarcolr
c8c7ea34e9 Forgot var/sides = 2 
Oops.
 2014-03-13 19:33:54 +02:00
Chinsky
682d5dadf7 Merge pull request #4579 from Vetinarix/dev 
Moar Medbay (v2)
 2014-03-13 21:19:38 +04:00
Jarcolr
51177f2663 You can now flip coins,AKA the D2 2014-03-13 18:56:01 +02:00
Chinsky
ba360a2c13 Splicing virus changes it's unique ID. 2014-03-12 18:39:51 +04:00
Chinsky
951b1b71fc Merge pull request #4575 from yashaldie/patch-2 
Fixes Diona Nymph handling updates
 2014-03-12 07:58:19 +04:00
yashaldie
dff02306a3 Merge pull request #4 from yashaldie/master 
temp
 2014-03-11 23:07:14 -04:00
yashaldie
55e43176b8 Merge pull request #3 from yashaldie/patch-2 
Fixes Diona Nymph handling updates
 2014-03-11 23:05:28 -04:00
yashaldie
ec0763cff5 Merge pull request #1 from Baystation12/master 
getting all updates
 2014-03-11 23:01:06 -04:00
Chinsky
a5fb8eec49 Merge pull request #4572 from yashaldie/patch-1 
Fixes adding encryption keys to borgs
 2014-03-12 05:12:16 +04:00
Chinsky
d5cc1c7ad5 Merge pull request #4578 from Loganbacca/bayfix 
Plasma glass processing fix
 2014-03-12 05:11:54 +04:00
Vetinari
4de35bf3bb Moar Medbay (v2) 
Rearranges secondary storage, fix psych apc
 2014-03-12 11:59:56 +11:00
Loganbacca
1f7a444ab1 Fixed plasma glass outputting slag 
Fixes #4560

Code was missing continue statements.
 2014-03-12 13:15:23 +13:00
Chinsky
2a8cdc7a11 Merge pull request #4574 from Ccomp5950/optimization_cherrypick 
MedicHUD bugfix
 2014-03-11 23:17:55 +04:00
yashaldie
bdd955b036 Fixes Diona Nymph handling updates 
Diona Nymphs were not getting their Handling procs called.
 2014-03-11 05:45:10 -04:00
Ccomp5950
b429605adc MedicHUD bugfix 
Because the HUD stuff is now in Life() if someone dies their healthbar and status aren't updated.
We're fixing that here.
 2014-03-11 02:51:13 -05:00
yashaldie
94a4d27100 Fixes adding encryption keys to borgs 
adding Encryption keys were not working on borgs. and also causing a run-time error. This should fix it.
 2014-03-10 23:39:36 -04:00
Chinsky
6771259ae6 Merge pull request #4571 from Ccomp5950/optimization_cherrypick 
Optimization cherrypick  HUD's and Joblist
 2014-03-11 07:01:43 +04:00
Ccomp5950
ebc188c600 Code effeciency project: HUD items rewrite 
Before: Every tick each HUD item would recalculate and redo images for every mob in view. For items like the secHUD where we're transversing implants and the various records this gets very expensive.

After: Mobs use their hud_list variable to store varius huditem images, when conditions change for those specific huditem images it updates the specific ones on demand. As a backup every 30 ticks or so the mob will update all of their hud_list.

Also: moved proc/RoundHealth() from 2 seperate locations into __HELPERS/mobs.dm

Conflicts:
	code/modules/mob/living/living.dm
 2014-03-10 21:59:58 -05:00
ZomgPonies
b03493fbae Efficiency: Joblist 
Conflicts:
	code/__HELPERS/global_lists.dm
 2014-03-10 21:57:36 -05:00
Chinsky
bf626cedf3 Merge pull request #4570 from DJSnapshot/hotfix 
quick fix for APCs related to IPC charging.
 2014-03-11 02:54:48 +04:00