cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,541 Commits 5 Branches 0 Tags
bf6c3d3a247f01f65d89fde021263c345305665b
Commit Graph

12287 Commits

Author SHA1 Message Date
Jeremy Liberman
bf6c3d3a24 Code review and remove baystation12.int from source control. 2014-03-25 22:17:02 -05:00
Jeremy Liberman
16f787a1da Virology - NanoUI, gameplay tweaks, bugfixes 2014-03-24 23:55:41 -05:00
RKF45
8f9f0acec5 Give bees a chance. 2014-03-22 20:44:13 +01:00
RKF45
aa08abed18 Fix 2014-03-22 19:06:45 +01:00
RKF45
5d6f425dd4 Removal of bees 2014-03-22 18:45:28 +01: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
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
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
Segrain
02cc696bf3 Fix for #4589. 2014-03-15 23:02:57 +03: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
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
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
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
yashaldie
55e43176b8 Merge pull request #3 from yashaldie/patch-2 
Fixes Diona Nymph handling updates
 2014-03-11 23:05:28 -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
Loganbacca
1f7a444ab1 Fixed plasma glass outputting slag 
Fixes #4560

Code was missing continue statements.
 2014-03-12 13:15:23 +13: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
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
DJSnapshot
044766ef11 quick fix for APCs related to IPC charging. 2014-03-10 15:52:01 -07:00
Chinsky
5ed6e58430 Readded welder backpack. 2014-03-11 02:06:30 +04:00
Chinsky
aa65639dad Merge branch 'dev' into virus-racism 2014-03-10 19:07:28 +04:00
Chinsky
0e08c90571 Merge branch 'dev-freeze' into dev 
Conflicts:
	maps/tgstation2.dmm
 2014-03-10 19:05:24 +04:00
Chinsky
13b9747504 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev 2014-03-10 18:48:12 +04:00
Chinsky
16dd8bfcd2 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into virus-racism 
Conflicts:
	code/modules/virus2/helpers.dm
 2014-03-10 18:43:34 +04:00
Chinsky
ec9b53bcad Lowered chance of exhale spreading viruses, as it was firing way too often. 2014-03-10 17:35:50 +04:00
Chinsky
d04b22e950 Changed sneezing to spread viruses like cough, but only in front of the mob. 
It gives a warning sometimes, so guy has 7 ticks to face elsewhere.
 2014-03-10 17:12:50 +04:00
Chinsky
fa274ab1a7 Fixed blood injections not transmitting viruses properly. 
Keep forgetting that list is associative.
 2014-03-10 16:16:14 +04:00
Chinsky
cd5715650b Merge pull request #4553 from Ccomp5950/hud_rewrite 
Code effeciency project: HUD items rewrite.
 2014-03-10 15:54:41 +04:00
Chinsky
0d06f80c84 Merge pull request #4545 from Ccomp5950/apc_rewrite 
Effeciency Project: APC / Machinery power usage.
 2014-03-10 15:53:29 +04:00
Ccomp5950
b014e22972 Merge pull request #4552 from Loganbacca/efficiency 
Efficiency Project: Airlock Sensors
 2014-03-09 23:55:29 -05:00
Ccomp5950
46e1cfead7 Merge pull request #4551 from Furlucis/master 
Removes an unnecessary check
 2014-03-09 23:54:20 -05:00
Ccomp5950
ddbc41b388 Merge pull request #4549 from Loganbacca/bayfix 
Multiple map fixes
 2014-03-09 23:54:07 -05:00
Joey Haas
e862e013e7 Smartfridges are now hackable. Also fixed a bug where one could not properly access the fridge in chemistry. 2014-03-10 02:14:57 +01:00