d853909f2b
HALT HALT HALT
2014-07-13 15:43:32 -07:00
0dc8aabd42
Revert "Spinning"
2014-07-13 00:55:18 +01:00
dec8444e12
Merge pull request #4118 from Aranclanos/spinning
...
Spinning
2014-07-12 20:52:55 -03:00
4b188a4dea
Merge pull request #4139 from Aranclanos/immovablerods
...
Fixed the crash with immovable rods
2014-07-12 20:46:06 -03:00
33ee96dc39
Fixed the crash with immovable rods
2014-07-12 20:44:48 -03:00
d8c9c8de9b
Merge pull request #4131 from paprka/fixxies
...
Paprika's epic fixes and shit
2014-07-12 21:11:31 +01:00
46c3a61fca
Merge pull request #4071 from CollenN/panelfix
...
Spawned humans have DNA, strip panel is better
2014-07-11 19:02:50 +01:00
537d135d82
Merge pull request #4113 from SodiumShine/cuffs-fix
...
Fixes handcuffs persisting visually after resist.
2014-07-11 15:02:06 +01:00
8bc96dcfdc
check for legcuffs too
2014-07-11 21:12:26 +10:00
dde416fdea
Fixed fix for persisting handcuffs sprite (Legcuffs/handcuffs mixup)
2014-07-11 16:16:40 +10:00
58c12ae7bb
Merge branch 'master' of https://github.com/SodiumShine/-tg-station into cuffs-fix
2014-07-11 15:34:52 +10:00
b92397a2e3
paprikkas gay
2014-07-10 20:12:24 -07:00
b313228586
Fixes pAI SecHUDs
...
Replaces "return" with "continue" on line 29. "return" was prematurely terminating the loop, causing pAIs to only see one or a few HUD icons at a time.
I plan to extend these HUDs to the AI in the future, after the freeze.
2014-07-10 09:16:56 -05:00
fdba3e8247
Merge pull request #4105 from Cheridan/bugslaying
...
Further Hydro Cleanup
2014-07-10 13:10:49 +01:00
8115d1dd75
Merge pull request #4114 from quiltyquilty/testing
...
fixes spagetti typo
2014-07-10 13:08:25 +01:00
d26085f794
Merge pull request #4119 from MrPerson/only_the_dead_know_peace_from_jittering
...
Make dead people stop jittering
2014-07-10 13:08:00 +01:00
87ca321900
Merge pull request #4107 from Firecage/Bugfixesgalore
...
Roman fix for issue #4101 Fixed #4101
2014-07-09 12:29:01 +01:00
41d3858769
Make dead people stop jittering
...
Fixes #3690
2014-07-09 02:19:01 -07:00
83cb25ea41
Added a spinning visual effect to rolling on the floor to extinguish yourself in case of a fire.
...
Lube will now make you spin while you're slipping.
Water will make you slip on the spot and won't move you forward.
Fixed the bug of wrong mob directions when buckling them while they are lying down.
2014-07-09 05:25:12 -03:00
a8a1126103
Merge pull request #4097 from Cheridan/ghost_alert
...
Ghost Alerts pt II
2014-07-09 07:47:16 +01:00
8d7e306b70
more shitty typo fixes
...
adds apostrophes to descriptions and makes italian accent consistent
2014-07-08 21:31:31 -05:00
32dba6f8ca
fixes spagetti typo
...
all instances of spagetti (in food.dmi, snacks.dm, and recipes_microwave.dm) have been changed to spaghetti, as well as boiledspagetti
2014-07-08 21:03:40 -05:00
1a0b4ac572
Fixes issue where resisting with handcuffs on would leave player sprite handcuffed as well as hand slots.
2014-07-09 00:34:50 +10:00
b0412d378c
Roman fix for issue ##4101
2014-07-08 13:00:49 +02:00
8288810ff6
Merge pull request #3531 from Rolan7/Issue3401
...
Fixes issue #3401 by adding a "SpeciesCanConsume" helper proc
2014-07-08 01:45:36 -05:00
4574a85b05
Merge pull request #4075 from Incoming5643/super_meat_pull
...
Fixes #4073
2014-07-08 00:49:33 -05:00
961adb8465
Further Hydro Cleanup
...
Fixes #3880 : Mapped or Adminspawned Growns will take on the default variables of their seed type.
Fixes #3828 : Meteor Pen projectiles are now visible
Some more refactoring, clearing up the growninedible.dm. Deletes hydroitemcode.dm. Keep code with the definitions, ew ew.
2014-07-08 00:22:31 -05:00
ed4c58e26f
Ghost Alerts p II
...
runes now properly show the area they're in (oops)
Narsie has been moved into her own file.
2014-07-07 15:21:32 -05:00
0aae810b87
fixes merge issue with killer tomatoes
...
fixes soap
2014-07-07 13:59:59 -05:00
079a13657f
fixing map and growns conflict
2014-07-07 13:29:30 -05:00
ccaef08fdc
Moves stuff to New()
...
Alright, I tested it, and this worked, so...
2014-07-07 14:02:58 -04:00
6699761ac3
Correcting a merge error... will probably squash this once I know things are okay.
2014-07-07 13:53:33 -04:00
065028cf1d
Merge branch 'master' of https://github.com/tgstation/-tg-station into ghost_notifications
...
i am going to murder you miauw
2014-07-07 12:51:56 -05:00
ffed2a901e
Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue3401
...
Conflicts:
code/modules/mob/living/carbon/monkey/monkey.dm - I don't know why it thought there was a conflict. Opening it in tortoisemerge showed no conflicts and automatically cleared the status. I reset to the repo's version just to be safe, then re-added my freakin 2 line function which has caused 2-3 "conflicts" so far.
2014-07-07 13:47:13 -04:00
0fa91b06f1
Merge branch 'master' of https://github.com/tgstation/-tg-station into Issue3401
...
Conflicts:
code/modules/mob/living/carbon/monkey/monkey.dm - I don't know why it thought there was a conflict. Opening it in tortoisemerge showed no conflicts and automatically cleared the status. I reset to the repo's version just to be safe, then re-added my freakin 2 line function which has caused 2-3 "conflicts" so far.
2014-07-07 13:42:31 -04:00
36ba571447
Merge pull request #4068 from Firecage/Moarbotany
...
Changes to botany plants
2014-07-07 15:43:01 +02:00
e2ca58aa81
Moar empty liiiiiiines
2014-07-07 15:15:43 +02:00
5d91d59fa2
MWAHAHAHHAHAHAHAH
2014-07-07 14:57:24 +02:00
c65b9b7c79
Merge pull request #4062 from Menshin/powernet_machine_connection
...
Powernets machines connection polishing
2014-07-07 11:55:52 +01:00
6fc59fee6e
More spaces because Miauww is a picky ass
2014-07-07 12:52:46 +02:00
6c9144db2b
Merge pull request #4063 from Menshin/solar_control_refactoring
...
Solar control refactoring
2014-07-07 11:48:00 +01:00
ced9dbd479
Merge branch 'master' of https://github.com/tgstation/-tg-station.git into Moarbotany
2014-07-07 11:33:52 +02:00
2830c8c092
Merge pull request #3961 from paprka/ergoisbackohno
...
Improved mining droprates
2014-07-07 10:28:30 +01:00
f88b6a6c4d
Merge pull request #4069 from AstralSerpent/borgment_harmweldhertz
...
Using a welding tool on augmented limbs, cyborgs or bots will hurt while on harm intent, instead of heal.
2014-07-07 10:25:45 +01:00
13c8800618
Fixes Miauw said.
2014-07-06 21:39:37 +02:00
ffe331878f
*Removes the 95% probability chance of any attempt to harvest meat from various simple animals to fail after dropping one meat. This also means the gib animation will always properly play (provided it exists).
...
*Meat spawning removed from harvest(), it's always been handled in gib. Harvest still exists due to some overrides on how it works for certain animals (mostly spiders)
*Fixes #4073
*Keeps me marginally relevent ヽ༼ຈل͜ຈ༽ﾉ
2014-07-06 13:59:15 -04:00
d497387355
Merge pull request #4048 from Kelenius/OfAIAndHUD
...
Gives the AI a simple hud
2014-07-06 12:58:13 -05:00
b1cb6ceeff
Expanded list of what Apron/Coveralls can hold
2014-07-06 19:49:54 +02:00
b5c45a7474
Icons for the Eggyplant and Moneyfruit
2014-07-06 18:13:22 +02:00
c025faa579
Grass tile amount dependent on potency
2014-07-06 17:55:10 +02:00
paprka
Alex
Aranclanos
A
GunHog
MrPerson
quiltyquilty
Firecage
Cheridan
CollenN
Rolan7
Swag McYolosteinen
Incoming
Ben G.