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
1e2187083f
Adds three new blob chems:
...
Omnizine blobs inject omnizine on hit, which initially HELPS mobs fighting it, but if they aren't careful in how often the blob hits them, they can rapidly fall into a very painful and hard to treat overdose. Three hits will inflict a heavy damage over time effect, more than that will inevitably cause death without treatment. They're a pleasent light lavender color.
Morphine blobs inject morphine on hit, which will keep mobs from slowing down but eventually will make them fall asleep. One hit will force a very small sleep after a while of fighting, multiple hits will forces longer sleeping after the same delay and overdose mechanics that make people drop held items and do minor tox damage. They're gunmetal grey.
Space Drugs will inject space drugs on hit, which makes mobs stumble around and make backing off from the blob more difficult. It also does minor on hit toxin damage. It's a weedy green.
Adding more blob chems makes any one chem type rarer, so I feel like this is one of the more fun ways the strength of some blob chems can be mitigated.
2015-04-06 18:18:16 -04:00
d0e9a5c0c9
Nerfs the kinetic accelerator.
...
Remove the plasma upgrade chance of rigging the cell since it doesn't work as intended and can break the KA without any feedback.
2015-04-06 22:43:03 +02:00
1f6a6b0e8c
Merge branch 'master' of https://github.com/tgstation/-tg-station into AlienIconUpdateFix
...
Conflicts:
code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
code/game/objects/structures/stool_bed_chair_nest/bed.dm
2015-04-06 19:38:51 +02:00
ad797d405e
Better parsnip sprite
2015-04-06 19:25:27 +02:00
dd1dac556b
Fixes a mob's pull not being broken when that mob is thrown.
2015-04-06 19:11:38 +02:00
9023f0de13
Blacklists shadowpeople from the race change
2015-04-06 13:02:11 -04:00
8499413649
Makes living/verb/resist more object oriented.
...
Adds a fourth mob size "MOB_SIZE_TINY" to differentiate corgi size and mouse size. (used in bear trap code)
Rewrites beartrap/Crossed() to have less istype checks.
Adds a flying var to simple animals (used in bear trap code)
Makes pulling update in living/life.dm() to fix pulling not stopping when you're incapacitated.
2015-04-06 18:45:37 +02:00
9c4e744fc9
Merge pull request #8744 from xxalpha/cyberplus
...
Better sprites for chest cyber implants.
2015-04-06 12:43:10 -04:00
1da595b535
Merge pull request #8737 from RemieRichards/NinjaCleanup2
...
A restructure/removal/cleanup of Ninja Code [Part 2] - Abilities and stuff
2015-04-05 21:54:33 -05:00
2e312cb510
Adds unstable mutation toxin
2015-04-05 22:02:41 -04:00
13060bb6f4
Adds space carp traitor item and fun for carp plushie.
2015-04-06 02:04:16 +01:00
a965f17c3c
Corrects return values, fixes cell draining.
2015-04-05 22:03:41 +01:00
5884c3727f
Fixes nonnumerical defines, Special interaction should work nicer now.
2015-04-05 21:52:42 +01:00
8e63fe05c1
Breath mask autotoggle
...
Now if you have a breath mask on your face, but lowered, and decide to start running on internals, you will automatically adjust the mask back on your face!
2015-04-05 22:03:24 +03:00
e04c9ac072
Fixes goat not producing milk and not retaliating.
...
Fixes bear not being able to attack you when it's AI is asleep and awaken by finding you as target.
Fixes many hostile animals not having their own attack verb text or attack sound.
Fixes goat moving even when pulled.
GiveTarget() is now called by FindTarget (because it was always called after every instances of FindTarget, and this solves the lack of retaliation).
2015-04-05 20:30:39 +02:00
cbbd5897ee
Fixes typos, rice pudding recipe changed, maxvolume and bitesize for superbiteburger and stew changed, cookbook updated.
2015-04-05 16:48:50 +02:00
df4acb5043
Give kudzu mouse_opacity 2 so clicking them is easier
...
Clicking anywhere on a turf not occupied by something else == clicking the kudzu. Makes them much easier to click basically.
2015-04-04 21:28:29 -07:00
cb86467e47
Consistency with X_act() names, Ninjas can now electrocute carbon mobs by "draining" them, as they would a cell/smes/mecha etc.
2015-04-05 02:30:43 +01:00
9c6c68b81a
Removes SpiderOS, SpiderOS Information moved to a SpiderOS Statpanel, Fixes ninja_sword_recall() by preventing a katana from ever hitting its owner (it can still hit other ninjas)
2015-04-05 01:55:27 +01:00
bebe775021
Splits ninja glove drain() proc up into /atom/proc/ninjaDrainAct()
2015-04-05 00:09:28 +01:00
ccbb042606
Fixes for DNA spread and transformation
2015-04-05 09:17:51 +12:00
8a3e2f75a3
Better sprites for chest cyber implants.
2015-04-04 20:06:10 +01:00
6550016ee6
Merge pull request #8723 from kingofkosmos/grammarfixes
...
Recieve --> Receive
2015-04-04 20:00:21 +02:00
AnturK
MrStonedOne
bear1ake
Cheridan
Wolfie13
phil235
Jordie0608
Incoming
Sawu
Iamgoofball
Fayrik
xxalpha
Xhuis
WJohn
CosmicScientist
Remie Richards
kingofkosmos
MrPerson
ACCount12
phil235