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
Chinsky
7f8c4b4d4d
Merge pull request #9081 from Kelenius/ofChemAndFour
...
Chemistry-Reagents: absolute paths and split
2015-05-04 21:24:09 +03:00
PsiOmega
1edb39b556
Merge remote-tracking branch 'upstream/dev' into BrokenGrills
2015-05-04 14:58:24 +02:00
volas
7ff68f8757
Modification to 'cinematic' command
2015-05-04 12:10:59 +03:00
Kelenius
e4ce047bd1
Chemistry-Reagents: absolute paths and split
2015-05-04 00:29:42 +03: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
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
volas
93d120a24c
merge fix
2015-05-02 11:16:15 +03:00
Chinsky
d5495870d1
Merge pull request #9045 from mwerezak/resist
...
Resist code cleanup, plus fixes
2015-05-02 08:22:51 +03:00
Chinsky
aeda1db3c5
Merge pull request #9041 from PsiOmegaDelta/ChitterChitter
...
Fixes #9029 .
2015-05-02 08:22:09 +03:00
Chinsky
8f1a9a9375
Merge pull request #9040 from PsiOmegaDelta/LOOCToggle
...
Admins can now toggle OOC and LOOC separately from each other.
2015-05-02 08:21:50 +03:00
mwerezak
3509178aa8
More resist refactoring
...
Reorganizes resist a bit more to allow for cleaner inheritance.
2015-05-01 15:13:07 -04:00
Ccomp5950
3baed4686e
Merge pull request #9039 from PsiOmegaDelta/QdelBullet
...
Fixes #9037 .
2015-05-01 10:45:10 -04:00
PsiOmega
b34e44ab84
Mice are now numbered.
...
You are not a man. This should also make things easier for admins.
2015-05-01 08:54:05 +02:00
mwerezak
8b32d2356e
Fixes #9044
...
Apparently stunned ticks down after grabs are updated.
2015-05-01 02:09:43 -04:00
mwerezak
98a4f54b88
Adds span classes, moves secure closet procs
2015-05-01 01:23:53 -04:00
mwerezak
cd707d8279
Resist verb cleanup
...
Fixes #8922 and cleans up resisting.
Moves various code pieces to new procs, subtypes, or other objects where
appropriate.
2015-05-01 01:23:26 -04:00
Chinsky
3d7bfd8aff
Merge pull request #9007 from PsiOmegaDelta/Initialize
...
Removes the need for spawn() in New() procs.
2015-04-30 21:12:06 +03:00
PsiOmega
fcfdcecd3a
initialize() should now always be called, be it on game starting up or object being created after game start.
...
Partially fixes #9036 .
2015-04-30 19:28:35 +02:00
PsiOmega
990b7b81a8
Another potential qdel sanity check.
2015-04-30 14:37:52 +02:00
PsiOmega
a49e6035a9
Fixes #9029 .
...
Reduces the announcement message delay for spiders from 800-900 seconds to 180-300 seconds.
Number of spiders now based on severity, with a moderate level event spawning as many spiders as before.
2015-04-30 10:22:58 +02:00
PsiOmega
82a8f32783
Admins can now toggle LOOC separately from OOC.
...
Also includes what I image to be proper permission checks for toggling the various OOC channels.
2015-04-30 09:52:29 +02:00
PsiOmega
40f0901e3d
Fixes #9037 .
...
Just one of many potential qdel issues. More to come, yay.
2015-04-30 09:35:57 +02:00
PsiOmega
f72fe0d194
Merge remote-tracking branch 'upstream/master' into dev
2015-04-30 08:09:25 +02:00
Yoshax
233b9a5d11
Adds Sabess' custom item
2015-04-29 16:47:20 +01:00
Yoshax
2c4783386f
Removes CE's hardhat
2015-04-29 16:11:53 +01:00
Kelenius
bd6a8e4d54
Chemistry-Holder.dm: absolute paths
2015-04-29 13:53:04 +03:00
Chinsky
34bbe33030
Merge pull request #8993 from PsiOmegaDelta/PortableNanoUI
...
Portable atmospheric pump/scrubbers now use NanoUI.
2015-04-29 09:43:47 +03:00
Yoshax
e5cd8c7adb
Fixes jacket
2015-04-28 20:40:16 +01:00