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
c34b8850a6
Fix
...
- Malfunction gamemode should now be startable. Probably not the nicest way to do it, but since the antag system is not documented at all i have no idea how to do it in nicer way.
2015-05-06 01:31:13 +02:00
Atlantiscze
024dabef7b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge
2015-05-05 22:13:58 +02:00
Atlantis
5201b88f60
Minor fix
...
- Malf AI spawning now works, currently only via TraitorPanel, the gamemode itself is still broken.
2015-05-05 21:36:02 +02: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
Kelenius
80467f8fa6
Removes metorapan reaction
2015-05-05 12:01:02 +03:00
PsiOmega
27b917ed6c
Teleport cleanup.
...
Teleporter code now uses:
Absolute paths.
Span classes.
Configured Z-levels to determine valid destinations, as opposed to hardcoded.
2015-05-05 09:55:19 +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
Kelenius
873b38e0a5
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/game/objects/effects/chem/chemsmoke.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
2015-05-04 22:36:35 +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
PsiOmegaDelta
d1227bdec5
Merge pull request #9087 from volas/cinematic2
...
Modification to 'cinematic' command
2015-05-04 20:55:08 +02: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
Chinsky
3f03fea06e
Merge pull request #9074 from RavingManiac/dev-2
...
Explosion tweaks and fixes
2015-05-04 21:25:12 +03:00
Chinsky
7f8c4b4d4d
Merge pull request #9081 from Kelenius/ofChemAndFour
...
Chemistry-Reagents: absolute paths and split
2015-05-04 21:24:09 +03:00
Chinsky
587015ff4e
Merge pull request #9086 from RavingManiac/master
...
Intent menu appears on zoom
2015-05-04 21:24:06 +03:00
PsiOmega
1edb39b556
Merge remote-tracking branch 'upstream/dev' into BrokenGrills
2015-05-04 14:58:24 +02:00
PsiOmega
6658f52ced
Merge remote-tracking branch 'upstream/master' into dev
2015-05-04 14:56:15 +02:00
PsiOmegaDelta
d86dd60c63
Merge pull request #9064 from Loganbacca/smokeFix
...
Chem smoke fadeOut sanity checks
2015-05-04 14:52:33 +02:00
volas
7ff68f8757
Modification to 'cinematic' command
2015-05-04 12:10:59 +03:00
RavingManiac
6123c8421e
Intent menu appears on zoom
2015-05-04 16:58:24 +10:00
Kelenius
e4ce047bd1
Chemistry-Reagents: absolute paths and split
2015-05-04 00:29:42 +03:00
RavingManiac
97adee16db
Recursive explosion resistance values for walls, space tiles, grilles and airlocks tweaked
...
Lattices now spawn properly when a floor tile is destroyed by an explosion. Probabilities involved tweaked
2015-05-03 21:53:02 +10:00
PsiOmega
6f9da12276
Implementing Destroy():s
...
First out: APCs, security camera consoles, vents.
2015-05-03 10:45:35 +02:00
RavingManiac
f1ccb3ee6e
Muzzle-flash lighting effect for guns
...
Energy guns now display shots remaining on examine
2015-05-03 12:19:11 +10:00
PsiOmega
3866fda394
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/ZAS/Turf.dm
code/modules/mob/living/carbon/carbon.dm
code/modules/mob/living/living.dm
code/modules/recycling/sortingmachinery.dm
2015-05-02 21:50:11 +02:00
PsiOmega
46ad005b50
Adds two missing pooling instances and corrects broken grilles health status.
2015-05-02 21:46:30 +02:00
PsiOmega
ca7fa2aa19
Grilles and rods.
...
Grilles no longer return more rods than they were created from when destroyed (by method other than wirecutters).
Rods are now acquired from and returned to a pool.
Also adds a pre-broken grille for mapping, avoids the case where one might be able to destroy the same grille twice.
2015-05-02 21:35:02 +02:00
PsiOmegaDelta
5d13f3091c
Merge pull request #9067 from Jarcolr/gauniform
...
Adds foxeye's approved custom item
2015-05-02 21:19:22 +02:00
Chinsky
a9b1f8bfe0
Merge pull request #9042 from PsiOmegaDelta/Buttons
...
Small remote button refactor.
2015-05-02 19:50:24 +03:00
Jarcolr
471988b080
Adds foxeye's custom item
...
http://baystation12.net/forums/viewtopic.php?f=33&t=12421
2015-05-02 11:19:52 +03:00
