c548df264b
Conflict fix
2014-03-05 06:30:29 +04:00
1cf3af0d72
Merge pull request #2973 from Kelenius/master
...
Seed extractor as storage
2014-03-04 17:04:22 -06:00
ab7a9c6266
Merge pull request #2965 from RandomMarine/plusonehat
...
Makes wizard hat defenses match the robe.
2014-03-04 03:05:07 -06:00
8307933d30
Merge pull request #2916 from Incoming5643/ventcrawlinginmyskin
...
Improved/Expanded Ventcrawling
2014-03-04 02:50:38 -06:00
00fd755b8c
Automerge Fix 2: Electric Boogaloo
...
This is why we can't have nice things.
2014-03-03 20:12:30 -06:00
5e61e9ea76
Merge pull request #2960 from hornygranny/balancepass
...
combat rebalance tweaks
2014-03-03 17:59:39 -08:00
d4c81ce247
Merge pull request #2936 from MrPerson/jitterbug_dizzydummies
...
Redo of jitteriness and dizziness.
2014-03-03 11:35:27 -06:00
4675af9f19
Seed extractor upgrade
2014-03-03 15:38:16 +04:00
f3ccaa5936
Merge conflicts fix
2014-03-03 05:42:31 +04:00
3901aa51a0
Hydro fix
2014-03-03 05:33:37 +04:00
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
789134d8f2
Automerge fix
...
Fixing the conflicts preventing an automerge.
2014-03-02 17:03:35 -06:00
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
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
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
2adf8cc643
Merge pull request #2932 from Miauw62/honkhonkhonkhonk
...
Mutagen is less fuck you deadly.
2014-03-02 13:43:31 -08:00
d2abd92f23
Merge pull request #2927 from AlexanderUlanH/alium
...
Buffed Lamarr at laser tag
2014-03-02 13:41:37 -08:00
f259e815d4
Merge pull request #2924 from TZK13/Shotgun-Shells
...
Incendiary shotgun shells
2014-03-02 13:39:50 -08:00
2aa4f2728f
Merge pull request #2912 from Miauw62/ihavenoideawhati'mdoing
...
Fixes some misc NODROP stuff I think
2014-03-02 13:30:23 -08:00
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
263e2abec6
Merge pull request #2885 from AlexanderUlanH/idedplsnerf
...
Rebalanced EMP's against mobs
2014-03-02 13:26:38 -08:00
467e65279b
Merge pull request #2904 from Rumia29/22/02/2014_sombrero
...
Sombrero(s) + Ponchos
2014-03-02 19:41:37 +00:00
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
1be87663f5
Formatting.
2014-03-02 05:57:50 -08:00
f71e4dc23a
Okay I think this is good now.
2014-03-02 05:43:25 -08:00
a76b4d6495
Whoops
2014-03-02 05:22:43 -08:00
d40d750c7a
Test one
2014-03-02 05:03:03 -08:00
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
f42e5fd332
Made chained orange shoes not useless, can't take them off yourself
2014-03-01 22:32:52 -08:00
2cbc3e45a3
Added trays
2014-03-02 07:19:41 +04:00
34931dc227
Item sprites!
...
Adds generic item sprites to all items added.
2014-03-01 20:19:32 -06:00
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
f355feb129
Merge branch 'master' of https://github.com/tgstation/-tg-station into PartBag
2014-03-02 04:59:35 +04:00
57b4f896d4
Making compilable
2014-03-02 04:40:05 +04:00
bb6009c9b7
Merge conflicts a bitch
2014-03-02 04:34:56 +04:00
08064142e6
Merge branch 'master' of https://github.com/tgstation/-tg-station into LingSting
2014-03-02 04:29:26 +04:00
2fd5557682
Conflict fix
2014-03-02 04:14:32 +04:00
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
5ef67438e6
grammarfix
2014-03-01 15:40:50 -05:00
600bf077f5
Updated file; fixed conflicts
2014-03-01 15:20:03 -05:00
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
25baec633c
Poncho + Ian Sombrero update
2014-03-01 12:37:42 -05:00
39c155c03a
Classy Outfits
...
Adds formal uniforms, a black tango dress, and a professional black suit
(with added Memorizer for maximum CIA spookyness). To do: make this
stuff orderable from cargo, and add some of it to the lawyer's closet.
2014-03-01 00:30:05 -06:00
cb7052f81c
Removed group_multiplier nonsense from gas_mixture.
...
Moved gas_mixture.dm to the datums directory.
Deleted FEA.
2014-02-28 18:12:33 -05:00
3ca1694fad
Make constructible dispenser use same order
2014-02-28 21:32:37 +00:00
7395fe0c62
Also screwed up an examine bit.
2014-02-28 00:24:48 -08:00
26206513da
Woops fucked up Tourette's
2014-02-28 00:21:12 -08:00
48923f9ce5
Redo of jitteriness and dizziness.
...
Fixes #2923
2014-02-27 23:19:44 -08:00
056932aa58
corrects unbuckle feedback message
2014-02-27 21:59:43 -08:00
05687e2490
Reduced the effectiveness of the resonator, resonator kit no longer has stimulant pills, lazarus mobs have attack_self 1 to not build an army of loyal mobs, as a wall of goliaths is too effective. Removed messaging admins for gibtontie deposits on the mining zlevel. Made the Superpacman generator a little more efficient.
2014-02-27 21:02:41 -08:00
Razharas
Cheridan
MrSnapwalk
Razharas
Kelenius
Ergovisavi
fleure
Aranclanos
RandomMarine
Hornygranny
Rumia29
YotaXP
GinjaNinja32
MrPerson