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
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
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
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
Razharas
2cbc3e45a3
Added trays
2014-03-02 07:19:41 +04: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
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
YotaXP
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
GinjaNinja32
3ca1694fad
Make constructible dispenser use same order
2014-02-28 21:32:37 +00:00
Hornygranny
056932aa58
corrects unbuckle feedback message
2014-02-27 21:59:43 -08:00
Ergovisavi
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
hornygranny
e65dc20971
Electrodes, stun bullets, darts and bolts reduced from 10 to 5
2014-02-27 13:04:58 -08:00
Miauw
2eee16f824
Nerfs mutagen from 10 rad damage per tick to 5 rad damage per tick
2014-02-27 21:14:47 +01: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
TZK13
9e79d2e4b4
Adds incendiary shotgun shells available via hacked autolathes in a new subclass of incendiary bullets and gave chemical dart shells their own sprites.
2014-02-26 12:05:41 -06: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
Cheridan
98b39580cd
haha oops thanks travis
2014-02-25 23:25:30 -06:00
Cheridan
b84c7c3b1d
Merge branch 'master' of https://github.com/Kelenius/-tg-station into Kelenius-master
...
Conflicts:
_maps/map_files/tgstation.2.1.2.dmm
code/game/machinery/vending.dm
code/modules/hydroponics/hydroponics.dm
2014-02-25 23:11:56 -06:00
Cheridan
21013863b9
Fixes conflicts
2014-02-25 19:49:24 -06:00
Cheridan
5ec24c8613
Merge branch 'master' of https://github.com/tgstation/-tg-station into ChuckTheSheep-Botany-Big-Booty-Twerk
...
Conflicts:
_maps/map_files/tgstation.2.1.2.dmm
code/modules/reagents/Chemistry-Reagents.dm
resolved with Theirs, must manually reapply fixes
2014-02-25 19:39:26 -06: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
Jittai
1a832cfb55
Boop
2014-02-25 19:26:20 -05: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
Ergovisavi
a4ffdf1cb7
Asteroid/Mining tweaks:
...
Adding mining GPS so miners can find each other more easily on the asteroid
Ore Redemption machine usability improved, also now only processes 10 ore per tick due to possible issues with mass processing of ores
Labor mineral rates edited to fall in line with the rest of the minerals, Labor stacker points increased to compensate
Treasure rooms should now spawn properly and start unlit, treasure items tweaked
Cargo points per plasma sheet significantly increased due to increased rarity
PACMAN generator made significantly more efficient to compensate for increased rarity of plasma, amount of plasma in engineering reduced as a result
Slight tweaks here and there of mining mobs in general
2014-02-25 06:03:17 -08:00
Razharas
56f94f59da
Merge branch 'master' of https://github.com/tgstation/-tg-station into PartBag
2014-02-25 05:05:22 +04:00
