Perakp
fa56f9892e
Merge with master, dissonant shriek and organic space suit
...
- Changed dissonant shriek and organic space suit from old verb system
to new system.
2014-03-15 13:49:26 +02:00
Cheridan
4e5d757726
Merge pull request #3064 from Rockdtben/removeTLEComments
...
Removing TLE comment stamps and other useless comments
2014-03-14 15:40:27 -05:00
Cheridan
50e7dbd71b
Merge pull request #2986 from Miauw62/simpleanimalspeed
...
Adjusts simple_animal speed to match recent human speed nerf.
2014-03-14 01:32:09 -05:00
Rockdtben
a795589bfb
Revert monkey/life.dm
2014-03-13 18:48:23 -05:00
Rockdtben
c9d12f4e39
Revert human/life.dm
2014-03-13 18:47:03 -05:00
Giacomand
50cfb1c18b
Merge branch 'master' of https://github.com/tgstation/-tg-station into alt_override_machine
2014-03-13 16:40:04 +00:00
Cheridan
9f98e67545
Merge pull request #3058 from Ikarrus/nohopsec
...
New Uniform for HoP
2014-03-13 11:32:23 -05:00
Rockdtben
a034e41f25
Removing TLE comment stamps and useless comments
2014-03-13 08:25:28 -05:00
ikarrus
6dd3403df3
-Updated on-mob sprites with a couple of quality fixes
...
-Corrected the HoP and Captain's preview image in character setup
2014-03-12 23:21:20 -06:00
Rockdtben
6eeeb1e5fe
Removed some useless comments from years ago.
2014-03-12 07:59:34 -05:00
Giacomand
c386bbd286
Changed overriden machines so that they do not attack cyborgs that aren't synced to the AI.
...
Overriden machines are their own subtype now.
Did not use the faction variable as that can be unreliable as neutral hostile mobs will attack any other mob without the neutral faction flag.
2014-03-09 10:16:37 +00:00
Ergovisavi
062f368ce0
Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss
2014-03-07 04:24:51 -08:00
Ergovisavi
6cfe2398d9
Changed around the way things are attacked by objects and got rid of the tapping message as it can screw with afterattack stuff.
2014-03-07 03:19:12 -08:00
Ergovisavi
a3ce04c000
Merge branch 'master' of https://github.com/tgstation/-tg-station into stamina_loss
...
Item attack changes
2014-03-06 03:17:02 -08:00
Miauw
6a01e1a4d2
Adjusts move_to_delay because HONK SEPERATE PLAYER AND AI SPEED VALUES
2014-03-05 12:48:27 +01:00
Razharas
c548df264b
Conflict fix
2014-03-05 06:30:29 +04:00
Miauw
58df2ab83d
Adjusts simple_animal speed to match recent human speed nerf.
2014-03-04 18:48:10 +01:00
Cheridan
8307933d30
Merge pull request #2916 from Incoming5643/ventcrawlinginmyskin
...
Improved/Expanded Ventcrawling
2014-03-04 02:50:38 -06:00
Cheridan
d4c81ce247
Merge pull request #2936 from MrPerson/jitterbug_dizzydummies
...
Redo of jitteriness and dizziness.
2014-03-03 11:35:27 -06:00
Razharas
f3ccaa5936
Merge conflicts fix
2014-03-03 05:42:31 +04:00
Ergovisavi
3a96098d55
Merge branch 'master' of https://github.com/tgstation/-tg-station into ore_redemp_fixes
...
Also fixed some weird autodrobe runtime on startup
2014-03-02 17:07:24 -08:00
Razharas
d2abd92f23
Merge pull request #2927 from AlexanderUlanH/alium
...
Buffed Lamarr at laser tag
2014-03-02 13:41:37 -08:00
Razharas
2aa4f2728f
Merge pull request #2912 from Miauw62/ihavenoideawhati'mdoing
...
Fixes some misc NODROP stuff I think
2014-03-02 13:30:23 -08:00
Razharas
b70c33d42a
Merge pull request #2905 from Incoming5643/GolemBreathing
...
Fixes Golems not being able to use internals with their own face
2014-03-02 13:27:38 -08:00
Razharas
263e2abec6
Merge pull request #2885 from AlexanderUlanH/idedplsnerf
...
Rebalanced EMP's against mobs
2014-03-02 13:26:38 -08:00
fleure
467e65279b
Merge pull request #2904 from Rumia29/22/02/2014_sombrero
...
Sombrero(s) + Ponchos
2014-03-02 19:41:37 +00:00
Perakp
edb2154b48
- Changes changeling abilities from verbs to proc_holder objects.
...
- Functionality should be unchanged
- Admins can varedit chemical costs of individual abilities.
- Allows coders to implement sting upgrades more easily.
2014-03-02 09:12:03 +02:00
Razharas
f355feb129
Merge branch 'master' of https://github.com/tgstation/-tg-station into PartBag
2014-03-02 04:59:35 +04:00
Ergovisavi
ac269baacb
Fixes bullet_act not checking for damagetype on many, many objects.
...
Replaces Holodamage with Stamina damage, if your stamina damage exceeds your current health, you get weaken(5)'d. Stamina heals itself slowly over time.
Makes the hallucination enemies deal more stamina damage than they did holodamage, but stamina damage heals now so it's mostly for just seeming threatening at the moment.
Adds the Disabler, a gun that does stamina damage. It has a range of your screen, but no more. Adds a disabler crate to cargo (security lock)
Fixes Lasertag ED209's because they were busted as shit
Reduces ED209's view range to 9 from 12, which was several times longer than your screen view, now is only a little bit more
Lastertag now does stamina damage instead of an instant stun for that GRITTY LASERTAG EXPERIENCE
2014-03-01 16:39:22 -08:00
Razharas
bb6009c9b7
Merge conflicts a bitch
2014-03-02 04:34:56 +04:00
Razharas
08064142e6
Merge branch 'master' of https://github.com/tgstation/-tg-station into LingSting
2014-03-02 04:29:26 +04:00
Razharas
2fd5557682
Conflict fix
2014-03-02 04:14:32 +04:00
Rumia29
600bf077f5
Updated file; fixed conflicts
2014-03-01 15:20:03 -05:00
Rumia29
25baec633c
Poncho + Ian Sombrero update
2014-03-01 12:37:42 -05:00
MrPerson
7395fe0c62
Also screwed up an examine bit.
2014-02-28 00:24:48 -08:00
MrPerson
26206513da
Woops fucked up Tourette's
2014-02-28 00:21:12 -08:00
MrPerson
48923f9ce5
Redo of jitteriness and dizziness.
...
Fixes #2923
2014-02-27 23:19:44 -08:00
Hornygranny
056932aa58
corrects unbuckle feedback message
2014-02-27 21:59:43 -08:00
hornygranny
c31647376e
This is for discussion of things that need to be changed to move away from purely stun based combat. Please only comment if you have something to contribute, rather than just saying you like or dislike it.
...
Shoes do not increase your movement speed
Stun/weaken on basically everything reduced from 10+ to 5 ticks
Time to unbuckle/uncuff self halved
2014-02-27 10:56:06 -08:00
AlexanderUlanH
6d7822e222
Added lines
...
(New ones)
2014-02-26 17:12:39 -05:00
AlexanderUlanH
13536c666b
Added damage checks to facehuggers
...
Facehuggers no longer die to zero-damage weapons and projectiles, like
pens and laser tag beams.
2014-02-26 15:32:08 -05:00
AlexanderUlanH
39927c2cb3
New robotic limb emp message
...
Now with more immersion
2014-02-26 12:44:04 -05:00
Miauw
5c55636bc0
Revert "Removes radio from pAI"
...
This reverts commit 0dc364a6b1
2014-02-26 14:50:18 +01:00
Aranclanos
6695c0c13b
Merge pull request #2850 from MrPerson/revenge_of_kitty_ears
...
Return of kitty ears
2014-02-26 07:40:39 -02:00
Incoming
f0b81575e7
Removes the ventcrawl verb, all ventcrawlers are still ventcrawlers and can use ventcrawling with the alt click. This is simutaniously less buggy and far easier to do on the fly.
...
The meat of ventcrawling is now stored in the vent pump, meaning anything can ventcrawl if it has ventcrawling on.
Ventcrawling 0 is no crawling, Ventcrawling 1 is naked crawling, Ventcrawling 2 and above is always crawling.
Yes you can var edit humans to be able to ventcrawl with this, great if you want to reenact diehard!
Simple animals that logically should fit in a vent can now ventcrawl. Note that this only is relevent for player controlled simple animals (staff of change/badminry), it won't be used by the mob AI.
2014-02-25 20:43:30 -05:00
Ergovisavi
83c85abe26
Merge branch 'master' of https://github.com/tgstation/-tg-station into ore_redemp_fixes
2014-02-25 17:38:24 -08:00
Rockdtben
9a2426a219
Merge pull request #2903 from hornygranny/harmyeller
...
Removes pAI radio
2014-02-25 17:19:11 -06:00
Miauw
82185a03c7
Makes NODROP items play a bit nicer with pockets.
2014-02-25 21:13:57 +01:00
Miauw
3d6a2ce74d
Fixes some misc NODROP stuff I think (don't worry I did actually test)
2014-02-25 21:07:57 +01:00
AlexanderUlanH
a3dd6c4dda
Consistentification
...
Sticking with the high-end of damage, for lack of strong opinions. Also
removed false claims of certain procs' being in human_defense.dm, and a
useless emp_act override in ion rifles. (All EMP's are 1 or 2 severity)
2014-02-25 10:04:49 -05:00
