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
24,435 Commits 5 Branches 0 Tags
e602a7e286a1ff39ffbdafc4dd4f767a54b22ead
Commit Graph

11033 Commits

Author SHA1 Message Date
Mloc
e602a7e286 remove the sub-area system 
Removes area/list/related and area/master.
They were only used by the old lighting subarea system.

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-10 17:06:29 +01:00
Chinsky
6b57189076 Merge pull request #9171 from PsiOmegaDelta/DroneSplosion 
Fixes #9169.
 2015-05-10 18:06:22 +03:00
Zuhayr
6e003e6d99 Merge pull request #9134 from PsiOmegaDelta/UngrabRuntime 
Grabs no longer endless loop runtime.
 2015-05-10 23:20:56 +09:30
PsiOmega
fff5ea7840 Grabs no longer endless loop runtime. 2015-05-10 12:11:52 +02:00
PsiOmega
647298e550 Fixes #9169. 
Drones can now survive entering chargers and being picked up.
 2015-05-10 10:52:56 +02:00
PsiOmega
5de22ace82 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/gloves/miscellaneous.dm
 2015-05-10 10:43:46 +02:00
PsiOmegaDelta
928b0a8be5 Merge pull request #9162 from volas/admin_stuff3 
Admin dice
 2015-05-10 10:11:29 +02:00
volas
a0f119b9dc Admin dice 2015-05-10 10:11:07 +03:00
Zuhayr
c0bb92bf34 Merge pull request #9146 from PsiOmegaDelta/AlarmConsoles 
Station alarm monitor changes.
 2015-05-10 15:37:50 +09:30
Zuhayr
90fd4d584e Merge pull request #9164 from comma/sterile 
Made sterile gloves actually start sterile
 2015-05-10 15:11:29 +09:30
Chinsky
6618b225a0 Made sterile gloves actually start sterile 
Fixes #9163
 2015-05-09 22:10:39 +03:00
volas
9fadad7b33 Player age now displayed also in notes 2015-05-09 19:33:11 +03:00
volas
84696567d8 Ability to select job equipment in 'Select Equipment' 2015-05-09 19:29:26 +03:00
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
b98461c2af Station alarm monitor changes. 
Replaces a couple of station alarm monitors with variants that display all alerts; fire, atmospherics, power, camera and motion rather than just the first 3.
Adds a basic station alarm monitor on the engineering outpost.
 2015-05-08 11:22:29 +02: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
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
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
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
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
Chinsky
d0c2b883aa Merge pull request #9069 from RavingManiac/dev 
Muzzle-flash lighting effect for guns
 2015-05-06 17:27:21 +03:00
PsiOmega
4602bd033f Fixes #9106. 
Now only carbons can be given items, as intended.
 2015-05-06 15:41:39 +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
ccomp5950
7436573177 Fixes the removal of all organs when admins use "Select Equipment" 
fixes #8884
 2015-05-05 21:37:28 -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
PsiOmega
1fc76bcb9b The examine tab now lists the available pen commands. 2015-05-05 09:03:43 +02:00
PsiOmega
1c38be5cfd Crayons are now children of pens. 2015-05-05 08:41:24 +02:00
PsiOmega
151c5204ee Merge remote-tracking branch 'upstream/master' into dev 
Conflicts:
	code/modules/projectiles/gun.dm
	html/changelogs/RavingManiac-master.yml
 2015-05-05 08:11:28 +02:00
Chinsky
e0a903d9eb Merge pull request #9093 from Baystation12/master 
Master->Freeze
 2015-05-05 01:42:57 +03:00
Ccomp5950
4a7d970bce Merge pull request #9090 from Kelenius/ofLogsAndTypos 
Fixes a few log-destroying lines
 2015-05-04 15:30:13 -04:00
Kelenius
33dde892e2 Fixes a few log-destroying lines 2015-05-04 21:33:30 +03:00
Chinsky
8294f02c1b Merge pull request #9072 from PsiOmegaDelta/BrokenGrills 
Grilles and rod tweaks.
 2015-05-04 21:25:24 +03:00