4a7d970bce
Merge pull request #9090 from Kelenius/ofLogsAndTypos
...
Fixes a few log-destroying lines
2015-05-04 15:30:13 -04:00
33dde892e2
Fixes a few log-destroying lines
2015-05-04 21:33:30 +03:00
8294f02c1b
Merge pull request #9072 from PsiOmegaDelta/BrokenGrills
...
Grilles and rod tweaks.
2015-05-04 21:25:24 +03:00
7f8c4b4d4d
Merge pull request #9081 from Kelenius/ofChemAndFour
...
Chemistry-Reagents: absolute paths and split
2015-05-04 21:24:09 +03:00
1edb39b556
Merge remote-tracking branch 'upstream/dev' into BrokenGrills
2015-05-04 14:58:24 +02:00
7ff68f8757
Modification to 'cinematic' command
2015-05-04 12:10:59 +03:00
52902b5195
Update utility.dm
2015-05-04 00:26:49 -04:00
e4ce047bd1
Chemistry-Reagents: absolute paths and split
2015-05-04 00:29:42 +03:00
c4755548da
Merge branch 'master' of https://github.com/PolarisSS13/Polaris
...
Conflicts:
maps/exodus-2.dmm
2015-05-03 16:09:58 -04:00
4555eb19da
Moar Janitor ERT
2015-05-03 15:23:18 -04:00
6f9da12276
Implementing Destroy():s
...
First out: APCs, security camera consoles, vents.
2015-05-03 10:45:35 +02:00
f1ccb3ee6e
Muzzle-flash lighting effect for guns
...
Energy guns now display shots remaining on examine
2015-05-03 12:19:11 +10:00
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
46ad005b50
Adds two missing pooling instances and corrects broken grilles health status.
2015-05-02 21:46:30 +02:00
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
5d13f3091c
Merge pull request #9067 from Jarcolr/gauniform
...
Adds foxeye's approved custom item
2015-05-02 21:19:22 +02:00
471988b080
Adds foxeye's custom item
...
http://baystation12.net/forums/viewtopic.php?f=33&t=12421
2015-05-02 11:19:52 +03:00
93d120a24c
merge fix
2015-05-02 11:16:15 +03:00
d5495870d1
Merge pull request #9045 from mwerezak/resist
...
Resist code cleanup, plus fixes
2015-05-02 08:22:51 +03:00
aeda1db3c5
Merge pull request #9041 from PsiOmegaDelta/ChitterChitter
...
Fixes #9029 .
2015-05-02 08:22:09 +03:00
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
3509178aa8
More resist refactoring
...
Reorganizes resist a bit more to allow for cleaner inheritance.
2015-05-01 15:13:07 -04:00
3baed4686e
Merge pull request #9039 from PsiOmegaDelta/QdelBullet
...
Fixes #9037 .
2015-05-01 10:45:10 -04:00
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
8b32d2356e
Fixes #9044
...
Apparently stunned ticks down after grabs are updated.
2015-05-01 02:09:43 -04:00
98a4f54b88
Adds span classes, moves secure closet procs
2015-05-01 01:23:53 -04:00
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
134eee0c6c
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into nanocrusade-two
2015-04-30 23:42:38 +02:00
3d7bfd8aff
Merge pull request #9007 from PsiOmegaDelta/Initialize
...
Removes the need for spawn() in New() procs.
2015-04-30 21:12:06 +03:00
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
990b7b81a8
Another potential qdel sanity check.
2015-04-30 14:37:52 +02:00
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
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
40f0901e3d
Fixes #9037 .
...
Just one of many potential qdel issues. More to come, yay.
2015-04-30 09:35:57 +02:00
f72fe0d194
Merge remote-tracking branch 'upstream/master' into dev
2015-04-30 08:09:25 +02:00
233b9a5d11
Adds Sabess' custom item
2015-04-29 16:47:20 +01:00
2c4783386f
Removes CE's hardhat
2015-04-29 16:11:53 +01:00
4500eac948
Merge and removal of a wild file
...
Merge branch 'dev' into ofChemistryAndStuff
Conflicts:
code/modules/reagents/Chemistry-Holder.dm
2015-04-29 14:20:44 +03:00
bd6a8e4d54
Chemistry-Holder.dm: absolute paths
2015-04-29 13:53:04 +03:00
34bbe33030
Merge pull request #8993 from PsiOmegaDelta/PortableNanoUI
...
Portable atmospheric pump/scrubbers now use NanoUI.
2015-04-29 09:43:47 +03:00
e5cd8c7adb
Fixes jacket
2015-04-28 20:40:16 +01:00
6c8bc809c6
Adds more items to custom loadout
2015-04-28 20:37:57 +01:00
851d5423f3
Merge pull request #8971 from mwerezak/burst-fire
...
Gun firemode system, burst firing
2015-04-28 20:24:03 +02:00
cc19bbb604
Merge pull request #8972 from DeeUnderscore/paper-functionality
...
Paper functionality additions
2015-04-29 02:46:21 +09:30
a2cea5c49c
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/modules/reagents/Chemistry-Recipes.dm
2015-04-28 19:22:35 +03:00
19aff88b90
Fixes #9017
2015-04-28 12:22:21 -04:00
74db1f71b5
Merge pull request #9018 from Kelenius/ofChemAndTwo
...
Chemistry recipes: absolute pathing
2015-04-29 00:15:20 +09:30
185aadb5a9
Chemistry recipes: absolute pathing
2015-04-28 16:55:13 +03:00
04b994f939
Merge pull request #9008 from PsiOmegaDelta/CameraPoff
...
Adds the APC & camera damage events.
2015-04-28 13:49:50 +03:00
948252d25b
Removes unused files added by accident, separates reagent files
2015-04-28 11:00:56 +03:00
Ccomp5950