b8a884a7c1
Added Exosuit Mining Scanner
2015-04-12 21:13:29 +01:00
ffd0db2b7b
Merge pull request #8581 from MrPerson/lighting_2015
...
Object based lighting system
2015-04-12 13:14:32 +02:00
01a8aa662a
Moved lighting stuff from controllers folder to its own module
...
Lighting SS no longer cares about the return of check(); the light datums are responsible for deleting themselves.
Cap on lighting effects from turfs is now 8 because they're static and shouldn't be flashing lights too often. This means starlight actually works now instead of being capped at 1 measly turf.
Lighting related ChangeTurf() code is in the lighting module. Changed it up to be faster on lighting controller init and not leave dangling lights when a turf becomes or stops being opaque or when it turns into space. This diff log is gonna be useless sadly but take my word for it, it all works.
Lighting related Moved() code is also in the lighting module. Opaque objects will now update nearby lights when they move (mechs).
Opaque objects other than the light datum's owner on the same tile as its owner will block the effect of the light. In other words a mech standing on the same square as a light bulb will block all the light of that bulb.
Changed "cheap_hypoteneuse()" with an even cheaper version; actually calculating the hypoteneuse! I can prove it's cheaper if needed.
Removed move_contents_to() because it's unused and trying to use it would cause major bugs with lights and other shit and I have no interest in supporting that, so let's not even tempt people.
2015-04-12 02:25:28 -07:00
853009f7e0
Merge pull request #8157 from Xhuis/shadowling_gamemode
...
Shadowling (MERGE-READY!!)
2015-04-11 17:51:23 +02:00
c9338f7212
Shadowling: RELEASE EDITION
2015-04-11 11:42:02 -04:00
076fc321f0
Merge pull request #8859 from Incoming5643/gutcheck_time
...
Better admin/config control of mulligans + tweaks
2015-04-10 15:19:42 -05:00
2ef8e76560
Merge pull request #8785 from AnturK/alien_proc_holder
...
Turns alien abilities into proc holders
2015-04-10 21:19:49 +02:00
170c91c8b9
Merge pull request #8823 from Incoming5643/shit_lets_be_barney
...
Removes the mutant_colors config option
2015-04-10 14:13:24 -05:00
2ccebc1e3f
Merge pull request #8766 from kingofkosmos/breathmaskautotoggle
...
Breath mask auto-adjust
2015-04-10 13:58:35 -05:00
5761ccde0a
Merge pull request #8794 from phil235/KineticAcceleratorNerf
...
Nerfs the kinetic accelerator.
2015-04-10 13:56:08 -05:00
43f03f5a08
Merge pull request #8855 from AnturK/slug_fixes
...
Headslug fixes
2015-04-10 20:50:04 +02:00
04f3fbe9b1
Merge pull request #8807 from phil235/HolopadSpamFix
...
Holopad spam fix
2015-04-10 13:37:27 -05:00
94b8f0db16
Merge pull request #8733 from MrPerson/cold_slowdown_speedup
...
Reduces penalty to movespeed from being cold
2015-04-10 12:48:39 -05:00
72eacad839
Merge pull request #8854 from MrStonedOne/thisshouldmakethingseasier
...
Minor permission panel fixes
2015-04-10 12:40:55 -05:00
4804ef1f01
Merge pull request #8843 from Wolfie13/MyFavoriteItem
...
Added Description Text for Pet Collars
2015-04-09 23:50:02 -05:00
40d1c3e347
Merge pull request #8863 from Iamgoofball/patch-53
...
Fixes slime core dupe bug
2015-04-10 14:38:25 +10:00
23f31693fa
Merge pull request #8739 from phil235/FoodRecipes2
...
A whole new bunch of foods and drinks
2015-04-09 23:28:31 -05:00
16a25f3dd8
Fixes slime core dupe bug
...
why the fuck this didn't throw an error is beyond me.
2015-04-09 20:49:07 -07:00
761985ce80
Merge pull request #8801 from xxalpha/fixfixfix
...
Implant Hotfix
2015-04-09 13:45:32 -07:00
d1892cffbe
Organizes the various continuous_round_x config options into one set of config options continuous. Functionality is only there for the same mode that already had that functionality, everything else is continuous always
...
Makes another set of config options for which rounds types, if any, use the midround antagonist (mulligan) system. Keep in mind this is by definition a subset of round with continuous set. Again this feature is only present for the roundtypes where I KNOW it works properly, other modes can't use midround antags.
The check antagonist screen will show how the game will behave when all the antagonists die, and it can be changed on the fly by admins, the four possible states are:
End on antagonist death (noncontinuous rounds)
Continue if antagonists die (unsupported continuous by default round)
Continue if antagonists die, creating replacement antagonists (continuous, using midround antags)
Continue if antagonists die, not creating new antagonists (continuous, not using midround antags)
When rounds prepare to mulligan admins will additionally get the option to just keep the round going without any automatically created antags in case they want to run their own shinanagans instead. They can also as before choose to end the round.
2015-04-09 16:03:11 -04:00
4ef5aa93dc
Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
...
Conflicts:
icons/obj/food.dmi
2015-04-09 17:38:14 +02:00
13baa6e3cb
Merge branch 'master' of https://github.com/tgstation/-tg-station into KineticAcceleratorNerf
...
Conflicts:
code/modules/projectiles/projectile/special.dm
2015-04-09 17:27:55 +02:00
c786ca7c54
Merge pull request #8814 from Fayrik/AllTheSmallThings
...
I dun goofed.
2015-04-09 17:08:53 +02:00
2b83512dc9
- Headslug fixes
2015-04-09 12:44:21 +02:00
5b2221cd4f
Changing/adding an admins rank now updates the player's table
2015-04-09 03:19:55 -07:00
af35d31bd9
Fixes the rank button on player panel
2015-04-09 03:19:20 -07:00
3ed097265f
Fix #8851
...
also fixes unbucking and cuff breaking.
2015-04-09 17:18:22 +09:00
58a362b2f1
Merge pull request #8822 from sawu-tg/blackface
...
Fixes Spraycans not coloring faces correctly (and changes up lipstick)
2015-04-09 00:20:23 -05:00
e31859a37e
Merge pull request #8734 from MrPerson/holidazed_and_confused
...
April Fool's lasts only 2 days plus another holiday
2015-04-09 00:15:24 -05:00
22deb5b46e
Added Description Text for Pet Collars
...
Because we know they're not some sort of space-tie.
2015-04-09 04:15:38 +01:00
e6e0143ec5
Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
...
Conflicts:
_maps/map_files/MiniStation/MiniStation.dmm
_maps/map_files/MiniStation/z2.dmm
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
2015-04-08 19:36:49 +02:00
a0ea5dfefe
Merge branch 'master' of https://github.com/tgstation/-tg-station into ProjectileFix1
...
Conflicts:
code/modules/mob/living/simple_animal/friendly/cat.dm
code/modules/mob/living/simple_animal/friendly/corgi.dm
code/modules/mob/living/simple_animal/friendly/farm_animals.dm
code/modules/mob/living/simple_animal/friendly/lizard.dm
code/modules/mob/living/simple_animal/friendly/mouse.dm
code/modules/mob/living/simple_animal/hostile/bees.dm
2015-04-08 19:10:20 +02:00
fdcae0a7ba
- Turns alien abilites into proc holders
2015-04-08 16:56:43 +02:00
633dc259dc
Merge pull request #8751 from MrPerson/kudzu_more_like_crapzu_amirite
...
Give kudzu mouse_opacity 2 so clicking them is easier
2015-04-08 09:04:17 -05:00
f537b43108
Merge pull request #8789 from phil235/BeartrapFix
...
Pull, resist, beartraps
2015-04-08 08:38:01 -05:00
ad33641101
Merge branch 'master' of https://github.com/tgstation/-tg-station into howdoyouknowyourbestfriendisntsecretlyawizard
...
Conflicts:
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
icons/obj/closet.dmi
2015-04-08 22:51:45 +10:00
37277f66e7
pre-map compile
2015-04-08 15:40:41 +10:00
654a332d21
Removes the Mutant_colors config option because anyone who's apt to turn on mutant races for joining doesn't want them to all look EXACTLY THE SAME (That's racist guys)
2015-04-08 01:24:55 -04:00
6103b2a5e1
Fixes Spraycans not coloring faces correctly
...
* Changes Spraycans and lipstick to use a fully tintable overlay.
* Lipstick now comes in more colors and (codewise) can be changed with one var.
* Spraycans now color the face overlay correctly, racism for everyone!
2015-04-08 15:02:32 +10:00
7df5998740
Nerfing plasma cutters, their damage and range is reduced in pressurised environment. Reduces drilling cost of all drills to make them appealing. Drill cells are now removed by clicking the drill, no more screwdriver needed. Resonator fields can no longer be stacked on each other. Switching from 5 to 3 seconds detonation on the resonator is now done by clicking it instead of screwdriving. Increasing building costs for plasma cutters. Removes mineral/screwdriver upgrades to resonator and kinetic accelerator. Plasma cutters can now only uses solid plasma.
2015-04-08 03:44:56 +02:00
4554d54229
Merge pull request #8765 from phil235/UdderFix
...
Fixes goat not producing milk and not retaliating.
2015-04-07 19:29:12 -05:00
c06ad7e6b8
moved process() to datum. made /datum/reagents/ process instead of the containers.
2015-04-07 17:13:59 -07:00
54154bec12
Merge branch 'master' of https://github.com/tgstation/-tg-station into explosive
2015-04-07 16:21:07 -07:00
98b5f41770
As you can see, I'm an idiot that codes potential infinite loops. (But I also fix it too.)
2015-04-07 21:48:00 +01:00
028b40ecd1
I hate fixing merge conflicts.
2015-04-07 20:51:47 +02:00
6b83575b28
Merge branch 'master' of https://github.com/tgstation/-tg-station into BeartrapFix
...
Conflicts:
code/modules/mob/living/living.dm
2015-04-07 20:27:37 +02:00
34a2b3be5b
Flying animals no longer triggers mines and mousetraps.
...
Space carps are flying animals now.
Adding changelog
2015-04-07 20:20:29 +02:00
e11a405165
Fixes the holopad choice window spam. The holopad now uses the standard popup window used by computers and most machines. A simple click to close it.
...
Fixes /obj/item/clothing/suit/space/pirat hiding the mob's jumpsuit when worn.
2015-04-07 17:44:43 +02:00
09067eac4f
Removed Reviver implant. Commented out some implant designs.
2015-04-07 07:52:07 +01:00
d60df6ea2e
Merge branch 'master' of https://github.com/tgstation/-tg-station into ProjectileFix1
...
Conflicts:
code/modules/mob/living/carbon/carbon_defines.dm
code/modules/mob/living/living_defines.dm
2015-04-07 01:06:38 +02:00
xxalpha
Swag McYolosteinen
MrPerson
Xhuis
Cheridan
phil235
Jordie
Iamgoofball
hornygranny
Incoming
phil235
AnturK
MrStonedOne
bear1ake
Wolfie13
Sawu
Fayrik