Rockdtben
bf995b001b
Merge pull request #3019 from drynwyn/master
...
Switch tournament gangster ammo to match weapon
2014-03-08 08:36:53 -06:00
Robson Richards
49e0cbd125
Reworked arguments to suit new GetTypeInAllContents
2014-03-07 21:06:46 +00:00
Robson Richards
0b07ae9f72
Merge branch 'master' of https://github.com/tgstation/-tg-station into 23/02/2014-Fuck-Nuke-Disk
2014-03-07 20:55:34 +00:00
drynwyn
abefc24a87
Switch gangster ammo to match weapon
...
Fixes #2988
2014-03-07 09:54:59 -05: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
Razharas
c548df264b
Conflict fix
2014-03-05 06:30:29 +04:00
Cheridan
1cf3af0d72
Merge pull request #2973 from Kelenius/master
...
Seed extractor as storage
2014-03-04 17:04:22 -06:00
Cheridan
ab7a9c6266
Merge pull request #2965 from RandomMarine/plusonehat
...
Makes wizard hat defenses match the robe.
2014-03-04 03:05:07 -06:00
Cheridan
8307933d30
Merge pull request #2916 from Incoming5643/ventcrawlinginmyskin
...
Improved/Expanded Ventcrawling
2014-03-04 02:50:38 -06:00
MrSnapwalk
00fd755b8c
Automerge Fix 2: Electric Boogaloo
...
This is why we can't have nice things.
2014-03-03 20:12:30 -06:00
Razharas
5e61e9ea76
Merge pull request #2960 from hornygranny/balancepass
...
combat rebalance tweaks
2014-03-03 17:59:39 -08:00
Cheridan
d4c81ce247
Merge pull request #2936 from MrPerson/jitterbug_dizzydummies
...
Redo of jitteriness and dizziness.
2014-03-03 11:35:27 -06:00
Kelenius
4675af9f19
Seed extractor upgrade
2014-03-03 15:38:16 +04:00
Razharas
f3ccaa5936
Merge conflicts fix
2014-03-03 05:42:31 +04:00
Razharas
3901aa51a0
Hydro fix
2014-03-03 05:33:37 +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
MrSnapwalk
789134d8f2
Automerge fix
...
Fixing the conflicts preventing an automerge.
2014-03-02 17:03:35 -06:00
Razharas
240ad7031c
Merge pull request #2891 from RobRichards1997/23/02/2014-BurnBabyBurnFueltankInferno
...
Gives fuel tanks a fire_act()
2014-03-02 14:19:44 -08:00
MrSnapwalk
b03fc3d645
More suits, and more fixes.
...
More suits by Nienhaus, and a few fixes for the contents of lockers.
Also added a dermal armor patch to the Captain's locker, for added head
protection without the downside of helmet-hair.
2014-03-02 16:10:08 -06:00
Razharas
0b837da831
Merge pull request #2942 from GinjaNinja32/chemistry-fix
...
Make constructible dispenser use same order as standard
2014-03-02 13:48:55 -08:00
Razharas
2adf8cc643
Merge pull request #2932 from Miauw62/honkhonkhonkhonk
...
Mutagen is less fuck you deadly.
2014-03-02 13:43:31 -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
f259e815d4
Merge pull request #2924 from TZK13/Shotgun-Shells
...
Incendiary shotgun shells
2014-03-02 13:39:50 -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
Aranclanos
e6d654853b
Merge pull request #2945 from YotaXP/kill-group_multiplier
...
Removed old FEA files, and a more-than-useless variable.
2014-03-02 14:59:56 -02:00
RandomMarine
1be87663f5
Formatting.
2014-03-02 05:57:50 -08:00
RandomMarine
f71e4dc23a
Okay I think this is good now.
2014-03-02 05:43:25 -08:00
RandomMarine
a76b4d6495
Whoops
2014-03-02 05:22:43 -08:00
RandomMarine
d40d750c7a
Test one
2014-03-02 05:03:03 -08:00
Ergovisavi
d2917b7992
Fixes an issue with teleportation scrolls and mining vouchers that allow you to gain unlimited uses from them.
2014-03-02 05:00:57 -08:00
Hornygranny
f42e5fd332
Made chained orange shoes not useless, can't take them off yourself
2014-03-01 22:32:52 -08:00
Razharas
2cbc3e45a3
Added trays
2014-03-02 07:19:41 +04:00
MrSnapwalk
34931dc227
Item sprites!
...
Adds generic item sprites to all items added.
2014-03-01 20:19:32 -06:00
MrSnapwalk
b6a60a07b4
Makes fancy items obtainable.
...
Adds a formal-wear crate, makes lawyers have laceup shoes, adds a better
sprite for the memorizer, adds the formal uniforms to each job's closet,
and fixes a typo in the object name of the black jacket. [FORMALNESS
INTENSIFIES]
2014-03-01 19:44:22 -06:00
Razharas
f355feb129
Merge branch 'master' of https://github.com/tgstation/-tg-station into PartBag
2014-03-02 04:59:35 +04:00
Razharas
57b4f896d4
Making compilable
2014-03-02 04:40:05 +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
Aranclanos
a671ea8c8b
removes my fucks ups, Chemistry-Recipes.dm is standardized now (again) and the weedkiller and pestkiller chemical reactions are added back.
2014-03-01 18:15:12 -03:00
Rumia29
5ef67438e6
grammarfix
2014-03-01 15:40:50 -05:00
Rumia29
600bf077f5
Updated file; fixed conflicts
2014-03-01 15:20:03 -05:00
Aranclanos
cbffed689d
Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeReactions
...
Conflicts:
code/modules/reagents/Chemistry-Recipes.dm
2014-03-01 16:22:01 -03:00
Rumia29
25baec633c
Poncho + Ian Sombrero update
2014-03-01 12:37:42 -05:00
