941e4ba907
increased heavy recoil, reduced drop chance
2015-02-22 18:52:53 -07:00
3e100729bc
Fixes mimana sprites. Small fix to snap corn picking. Fixes russian revolver not killing you.
2015-02-22 23:02:07 +01:00
b439b838d3
jetterpecks
2015-02-22 13:24:26 -08:00
bd870d649c
Adds new plants to botany (rice, oat, blue cherries, holy melon, parsnip, geranium, lily, snap corn, blumpkin, mimana, sweet potato, vanilla, red beet) and adding two new reagents (vanilla and rice).
2015-02-22 22:10:25 +01:00
9eceaeb9e8
Goddamit
2015-02-22 19:21:44 +01:00
fb2912146f
Adds plants_flag, sets moonoutpost aliens to use it
2015-02-22 19:19:31 +01:00
fa0fa08171
Fixes #7877 Sleepypen bug. Pen only injected 50 of the 55 units.
2015-02-22 12:14:14 -05:00
b7e7d5a877
final fixes and changes
2015-02-22 06:35:49 -08:00
e68a4027b2
double exclaimation points
2015-02-22 03:50:40 -08:00
555840fc1b
Merge pull request #7498 from Incoming5643/Fell_Pull_Commit_of_Orc_Slaying_+2
...
Magic Mania 1.85: RPG loot event
2015-02-22 11:59:09 +01:00
96e7a5c473
Merge pull request #7864 from Jordie0608/yoursisthelistthatwillcrashtheserver
...
Warning check before sorting long lists in vv
2015-02-22 11:57:01 +01:00
3675f2e997
Merge pull request #7899 from Jordie0608/eyesarewindowstothesoulbeardsarewindowstothechin
...
Fixes #7898
2015-02-22 11:55:13 +01:00
edcfae62d3
spellfix
2015-02-22 21:32:39 +11:00
3572e2c2c5
packages play a ripping noise when you open them
2015-02-22 01:11:03 -08:00
44e3c104e3
Merge pull request #7857 from Delimusca/heatermaths
...
fixes heater rounding, lowered heater coefficient
2015-02-21 23:37:33 -08:00
59547b56a5
Procs out the mutant bodyparts code more jucidiously so we don't have to call update_body every time you put a suit on.
...
Fixes a bitflag I missed that was causing some confusing behavoir
2015-02-21 21:07:05 -05:00
f608bf2a31
improves heavy weapons
2015-02-21 19:00:31 -07:00
6843562301
Added some layers to allow for accurate "3D" placement of otherwise obtrusive mob features like tails or weirdly shaped heads. In addition exosuits that hide the uniform will now also hide a lizards tail, and masks that hide the face will push a poor lizards nose in so we don't see it clipping out the front. of the damn thing.
2015-02-21 19:34:10 -05:00
167f4ef0ee
Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
2015-02-21 14:14:50 -08:00
31491a5e27
quick push of everything I have now, fucking foam
2015-02-21 13:36:16 -08:00
15dacd50b1
Replaces cancable var with two new procs.
...
Clean up.
2015-02-21 20:15:03 +00:00
ca57c1070f
Fixes goldslime+blood reaction spawning a hostile mob and goldslime+plasma only spawning 1 mob.
2015-02-21 20:45:34 +01:00
079f47c47c
Merge pull request #7768 from GunHog/AdminLoggingForExperimentor
...
Admin logging for Experimentor and Relics
2015-02-21 19:19:48 +01:00
145175342f
Makes NPC queens/drones plant weeds/eggs
2015-02-21 18:31:21 +01:00
897df7999d
Optimises a loop
2015-02-21 17:14:47 +00:00
1d63720e4a
Removes unnecessary resource hog, It's not even needed, I'm a derp.
2015-02-21 16:41:28 +00:00
9efa69145d
Fixes #7852 , Drones now have 3 vision modes to choose from: Static, Blank (Black icons) and Rougelike colour lettering.
2015-02-21 15:41:45 +00:00
19e3cd5d1e
Fixes a window's size and a colored text in another one.
2015-02-21 16:24:13 +01:00
e9a943218c
Fixes being able to break free from a pull while handcuffed if the puller is buckled.
...
Add the incapacitated proc to mobs to check for stat, stun, weakened, paralysis, restrained. And replacing those checks by that new proc in some places.
2015-02-21 14:49:47 +01:00
964544d16b
bolded yelling and missing green span
2015-02-21 04:17:55 -08:00
5a3d9d883f
Warning check before sorting long lists in vv
2015-02-21 21:46:42 +11:00
137e0b3e7f
Replaces Xenomicrobe gas from Experimentor.
...
Replaces Xenomicroboes with Sulfuric Acid (subject to change).
2015-02-21 03:13:27 -06:00
0f8fc471d3
fixes heater rounding, coeff. lowered to .10
2015-02-21 01:03:30 -07:00
ac6bf07b17
go away untable mutagen
2015-02-20 22:04:26 -08:00
e24e94544e
Merge branch 'master' of https://github.com/tgstation/-tg-station into drugs
...
Conflicts:
code/modules/food&drinks/food/snacks_meat.dm
code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
icons/obj/drinks.dmi
icons/obj/food.dmi
2015-02-20 22:00:53 -08:00
43b7567095
Merge branch 'master' of https://github.com/tgstation/-tg-station into FUCKGIT
...
Conflicts:
icons/turf/floors.dmi
Fixing merge conflicts
2015-02-21 05:10:20 +03:00
e5b53f2e3c
Finishing up
2015-02-21 01:26:58 +00:00
70eda74c81
Merge remote-tracking branch 'origin/catwalkmachines' into catwalkmachines
2015-02-21 00:42:30 +00:00
a185281003
Merge branch 'master' of https://github.com/tgstation/-tg-station into LifeProcsDuplicateFix
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
2015-02-21 00:37:53 +01:00
c8b0a21baa
Fixes a lot of duplicated code in life and its subprocs for carbon mobs.
...
Fixes cyborg and monkeys no seeing any flash when flashed.
2015-02-21 00:37:04 +01:00
51b4bbf71e
Revert "Allows portable machines to be mounted on any turf that can have cables."
2015-02-21 02:29:29 +03:00
cd00e07f4f
Merge remote-tracking branch 'remotes/upstream/master' into AdminLoggingForExperimentor
...
Conflicts:
code/modules/research/experimentor.dm
2015-02-20 15:23:07 -06:00
1cd892a0fd
Experimentor Invesigate Take 1
...
- Logs lots of the things to experimentor investigate.
2015-02-20 15:09:59 -06:00
fe3764dae8
Merge pull request #7765 from Thunder12345/glovening
...
[REFACTOR] Reworks maintenance fake insulated gloves
2015-02-20 14:24:54 -06:00
ac00052da6
Merge pull request #7780 from xxalpha/catwalkmachines
...
Allows portable machines to be mounted on any turf that can have cables.
2015-02-20 13:32:44 -06:00
6d78f9b77d
Merge pull request #7828 from Incoming5643/let_us_never_speak_of_this_again
...
Removes the unintended ability to have sex with cats
2015-02-20 13:18:46 -06:00
8143aae66e
Ensures Drones see Drones, Syndrones can now see mobs instead of static due to their evil programming.
2015-02-20 18:57:01 +00:00
23677f4df1
Merge pull request #7808 from phil235/CookingTweaks
...
Cooking Tweaks
2015-02-20 12:02:04 -06:00
b67569869b
Merge pull request #7843 from Mandurrrh/fixforbooze
...
Fixes issue #7841
2015-02-20 18:51:29 +01:00
7af2e457c8
Merge pull request #7705 from GunHog/NVG_Mesons
...
Adds NVG Mesons
2015-02-20 17:44:38 +01:00
Delimusca
phil235
paprka
AnturK
Mandurrrh
Iamgoofball
Swag McYolosteinen
Jordie0608
hornygranny
Incoming
xxalpha
Remie Richards
GunHog
Razharas
Sometinyprick
Razharas
Cheridan
phil235