cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
24,408 Commits 5 Branches 0 Tags
be91976e3020d680d9adf02d67b7eff78f7fdbb5
Commit Graph

18372 Commits

Author SHA1 Message Date
PsiOmega
be91976e30 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-05-09 11:13:05 +02:00
PsiOmegaDelta
2a53f6bf6d Merge pull request #9153 from Techhead0/rlimb_data-fix 
Fixes rlimb assignment for hands/feet in chargen
 2015-05-09 10:00:10 +02:00
Techhead0
e368c78b42 Fixes rlimb assignment for hands/feet in chargen 
An easy fix for a small typo that caused rlimbs not to be assigned to
second_limb (hands/feet). I'm surprised the bug went unnoticed this
long.
 2015-05-08 21:12:15 -04:00
Chinsky
513579b8ac Merge pull request #9140 from PsiOmegaDelta/Accounting 
Fixes #9139.
 2015-05-08 19:41:57 +03:00
PsiOmega
999b0ca99d Compilation fixes. 2015-05-08 08:33:41 +02:00
PsiOmega
28d24fc8c6 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/computer/atmos_control.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/modules/mob/mob_helpers.dm
 2015-05-08 08:23:15 +02:00
Ccomp5950
a36acc8eba Merge pull request #9136 from GinjaNinja32/CyborgIsNotAI 
Fixes cyborgs showing up as AIs in radio output for AIs.
 2015-05-07 23:23:54 -04:00
Ccomp5950
c1350e8df8 Merge pull request #9101 from StarSmasher44/patch-3 
Applies Icon Caching to battery racks, Fixed edition
 2015-05-07 23:20:30 -04:00
Ccomp5950
7e120053ed Merge pull request #9137 from GinjaNinja32/tcomms 
Fixes... things. Lots of things.
 2015-05-07 23:16:02 -04:00
PsiOmega
72dc583ef5 Fixes #9139. 
Arranges the order at which starting funds is set and account creation is done.
 2015-05-07 19:23:56 +02:00
GinjaNinja32
2e2cb07ba7 Fixes... things. Lots of things. 2015-05-07 15:32:16 +01:00
GinjaNinja32
cec16d7559 Fixes cyborgs showing up as AIs in radio output for AIs. 
Also fixes pAIs and non-carbon non-robot non-AI non-pAI mobs doing the same.
 2015-05-07 14:48:18 +01:00
PsiOmega
7cbd72d1be Cleanup. 2015-05-07 09:09:12 +02:00
PsiOmega
2eb35c6de8 Relocates the new ERT id-card creation code to its appropriate location. 2015-05-07 08:44:54 +02:00
PsiOmega
10edb06036 Do not copy-paste code. 
Do not copy-paste code.
 2015-05-07 08:43:24 +02:00
PsiOmega
9e4dacc765 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/game/machinery/machinery.dm
	code/game/objects/items/weapons/storage/misc.dm
	code/game/response_team.dm
	html/changelogs/HarpyEagle-NeckgrabFix.yml
 2015-05-07 08:14:57 +02:00
Zuhayr
7389ec379f Merge pull request #9112 from PsiOmegaDelta/SenseMe 
Adds stretches of power cable around the construction outpost.
 2015-05-07 09:30:17 +09:00
Ccomp5950
143bde9774 Merge pull request #9111 from PsiOmegaDelta/AreaContentsConcat 
Cloning vats and DNA scanners are again located by cloning computers.
 2015-05-06 17:31:19 -04:00
Ccomp5950
f2b4543ba6 Merge pull request #9113 from PsiOmegaDelta/AntagOOCRights 
Ensures only antags and admins can see AntagOOC.
 2015-05-06 17:30:58 -04:00
Chinsky
af7ec5c8ad Merge pull request #9099 from StarSmasher44/patch-2 
Adds Icon Caching for some Mob HUD Icons
 2015-05-06 19:01:20 +03:00
StarSmasher
89e37938ca Optimizes invalidateCameraCache() 
Before optimization it used 20.155 Total CPU/Self CPU on 183 calls
After optimization it used 0.443 Total CPU/Self CPU on 223 calls.
 2015-05-06 17:41:32 +02:00
Chinsky
fefcae2961 Merge pull request #9097 from PsiOmegaDelta/TeleporterCleanup 
Teleport cleanup.
 2015-05-06 17:27:35 +03:00
Chinsky
d0c2b883aa Merge pull request #9069 from RavingManiac/dev 
Muzzle-flash lighting effect for guns
 2015-05-06 17:27:21 +03:00
Chinsky
d1b4289b74 Merge pull request #9118 from PsiOmegaDelta/HaltSecurity 
Fixes #9065.
 2015-05-06 17:25:11 +03:00
Chinsky
16e417092a Merge pull request #9116 from PsiOmegaDelta/DoNotSeeMe 
Fixes #9107.
 2015-05-06 17:25:03 +03:00
Chinsky
427bab89d8 Merge pull request #9117 from PsiOmegaDelta/PhysicalHarm 
Fixes #9083.
 2015-05-06 17:24:55 +03:00
PsiOmega
4602bd033f Fixes #9106. 
Now only carbons can be given items, as intended.
 2015-05-06 15:41:39 +02:00
PsiOmega
4af458ef6c Fixes #9065. 
Central Command ids now at least makes security equipment respect you.
 2015-05-06 15:23:44 +02:00
PsiOmega
5eeec376b2 Fixes #9083. 
Computers are now only affected by brute and burn damage.
 2015-05-06 15:12:14 +02:00
PsiOmega
767c6a151b Fixes #9107. 
The empty donut box no longer uses a non-existing item state.
 2015-05-06 15:06:19 +02:00
PsiOmega
e9b32cf26e Ensures drained_this_tick is actually set. 2015-05-06 12:30:05 +02:00
PsiOmega
72ffea6fd3 Attempts to ensure the powersink remains processed correctly, moves processing disconnection into Destroy(). 2015-05-06 12:25:50 +02:00
PsiOmega
78a9a43de6 Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/controllers/master_controller.dm
	code/game/objects/items/devices/powersink.dm
 2015-05-06 12:19:50 +02:00
PsiOmega
b6501998e3 Ensures only antags and admins can see AntagOOC. 
Adds rights check, not only holder verification.
 2015-05-06 11:34:54 +02:00
PsiOmega
83d1b9ad22 Adds stretches of power cable around the construction outpost, ensuring one does not have to climb over machines to being laying cables. 2015-05-06 11:25:04 +02:00
PsiOmega
b349e76604 Cloning vats and DNA scanners are again located by cloning computers. 2015-05-06 09:27:11 +02:00
Zuhayr
df6ff69f01 Merge pull request #9103 from DeeUnderscore/fix-fabricators 
Fix mech fabricators not syncing
 2015-05-06 11:04:21 +09:00
ccomp5950
7436573177 Fixes the removal of all organs when admins use "Select Equipment" 
fixes #8884
 2015-05-05 21:37:28 -04:00
Atlantiscze
91e3ced65e Powersink Fix 
- Fixes powersinks lasting for infinite duration before exploding.
- Minor adjustment to powersink drain rates. Powersink now drains up to 1.5MW instead of  1MW. It also attempts to drain up to 5kW instead of 2kW from each APC, unless powernet supplies enough power. They can still be overpowered by pumping more than 1.5MW into the grid, which is possible if you either install more coils into main SMES, or use the solars. Even 1MW of default SMES is enough to slow the drain effect considerably, espicially if you can isolate it with breakers.
- Fixes "APC Flickering" issues caused by powersinks. Powersinks are now processed immediately after powernets, which ensures they are first to take power from that powernet. This is unfortunately necessary as APCs would take power first, which is not desired.
- Minor refactor while i was at it - absolute paths, span classes, visible_message() instead of for cycle. No gameplay effect.
 2015-05-05 18:49:11 +02:00
Daranz
82b7af7fb5 Fix mech fabricators not syncing 
Fixes #9058.
 2015-05-05 11:42:05 -04:00
StarSmasher
4afe2e46e6 Updates code based off of GinjaNinja's Feedback 2015-05-05 17:16:10 +02:00
StarSmasher
2675bac50e Applies Icon Caching to battery racks, Fixed edition 
I did a whoops, should be good now, I hope.
 2015-05-05 16:50:23 +02:00
StarSmasher
2a96210223 Fixes this one at least. 2015-05-05 16:47:40 +02:00
Mloc
82b810d363 Revert "Applies Icon Caching to battery racks" 2015-05-05 15:36:19 +01:00
StarSmasher
b27dbdaaf5 I'm too broken for this 
Also fixes this one, probably.
 2015-05-05 14:21:28 +02:00
StarSmasher
b6b3548760 I'm too broken for this 
Should work now.
 2015-05-05 14:20:35 +02:00
StarSmasher
1c9dbfdb2b Removes unneeded variable 
All good now.
 2015-05-05 14:13:26 +02:00
StarSmasher
f69358d4f5 Removes unneeded variable 
Thanks Psi for pointing that out.
 2015-05-05 14:12:03 +02:00
StarSmasher
b03d5a7850 Adds Icon Caching for some Mob HUD Icons 
Adds partial caching for some of the smaller HUD additions of the mobs to allow for less processing needed to constantly update the icons when needed.
Code has been tested on a live server for several weeks prior to it's shutdown, so it should work as great as it has worked for us.
 2015-05-05 14:04:53 +02:00
StarSmasher
89b65e216f Applies Icon Caching to battery racks 
In my tests a while ago, I found that the battery racks came quite high in the profiler. So I decided to see if I could alleviate some of that trouble.

Very simple, caches the icons based off of previous work done on the APC, requires less processing for the icon updates.
Function has been tested and has been used on a live server for a few weeks prior to said server's shutdown.
Will make a 2nd PR following another like this except for HUD icons.
 2015-05-05 13:12:52 +02:00