Cheridan
16994a1ae2
Merge pull request #3057 from Rockdtben/removeComments
...
Removed some of my useless comments from years ago.
2014-03-13 11:14:42 -05:00
Razharas
13454a78b2
Merge pull request #3054 from Limeliz/patch-2
...
Fixing JMP-link in asay for C4 planting
2014-03-12 22:35:01 -07:00
Razharas
eca26b70da
Merge pull request #3049 from RandomMarine/dnainjectorupgrades
...
Reduces DNA injector radiation based on its origin's upgraded parts.
2014-03-12 22:34:01 -07:00
Rockdtben
6eeeb1e5fe
Removed some useless comments from years ago.
2014-03-12 07:59:34 -05:00
Emil
59e5e4294f
Fixing JMP-href in asay for C4 planting
...
The JMP-link in the message_admins() when planting C4 on walls/doors etc always teleported admins to 0,0,0. It has been fixed now.
2014-03-12 05:24:12 +01:00
Cheridan
f7337f1aa9
Merge pull request #3014 from fleure/tanks
...
Added atmos and jani watertanks, changed nozzle types [MAP]
2014-03-11 21:24:27 -05:00
RandomMarine
c03052aed8
DNA injectors get DNA scanner's damage_coeff.
2014-03-11 09:23:41 -07:00
Rockdtben
83334f07be
Merge pull request #3041 from hornygranny/balancepass
...
Buffs stun baton + classic baton
2014-03-10 20:54:25 -05:00
fleure
b6e7155a24
Changed janitor and atmos tanks slightly
2014-03-10 20:27:21 +00:00
Hornygranny
02b8288589
Stun baton buffed, classic baton buffed
2014-03-09 16:46:55 -07:00
Hornygranny
4391b132c7
Revert "Increases most stuns 40% in length (now 7, up from 5, which was down from 10)"
...
This reverts commit d550b3491b
2014-03-09 16:44:19 -07:00
Cheridan
19a9717ece
Merge pull request #3010 from fleure/firtree
...
Fixed typo in Tyrant AI lawset
2014-03-09 15:15:21 -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
Hornygranny
d550b3491b
Increases most stuns 40% in length (now 7, up from 5, which was down from 10)
2014-03-06 22:56:22 -08:00
fleure
026c991b95
Added atmos and jani watertanks, changed nozzle types
2014-03-07 01:13:19 +00:00
Fleure
4914ee6dc4
Fixed typo in Tyrant AI lawset
2014-03-06 17:18:57 +00:00
Aranclanos
fb64ae9a41
the vending refill objects won't runtime anymore at roundstart if they were placed in the map
2014-03-06 10:20:48 -03: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
Cheridan
a2fb8bc3eb
Merge pull request #2983 from ChuckTheSheep/TC-Green-Text
...
Fix for Nuker's TC Green Text.
2014-03-05 00:18:49 -06:00
Razharas
c548df264b
Conflict fix
2014-03-05 06:30:29 +04:00
ChuckTheSheep
f4e2d30749
Made uplink_owner key rather than name
...
Had issues with clowns/mimes/nuke ops due to name changes.
2014-03-04 14:55:03 -05:00
Cheridan
5d30d1923e
Merge pull request #2970 from Ergovisavi/bangarang
...
Flashbang tweaks
2014-03-04 02:59:10 -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
Ergovisavi
a68a51ac52
Flashbangs will now stun borgs. If you are holding the flashbang on your person somehow, or are in the exact tile that the flashbang is on, your eye/ear protection is void and you take a significantly longer stun than you would otherwise. Flashbangs have a better falloff check than they did previously.
2014-03-02 23:48:46 -08: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
MrSnapwalk
789134d8f2
Automerge fix
...
Fixing the conflicts preventing an automerge.
2014-03-02 17:03:35 -06:00
Razharas
6b14c42c41
Merge pull request #2898 from ChuckTheSheep/TC-Green-Text
...
TC use count appears on round end
2014-03-02 13:02:28 -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
20901b24d0
Increases cuffing speed to match secborgs, help with shorter stuns
2014-03-01 21:00:39 -08:00
MrSnapwalk
34931dc227
Item sprites!
...
Adds generic item sprites to all items added.
2014-03-01 20:19:32 -06: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
2fd5557682
Conflict fix
2014-03-02 04:14:32 +04:00
MrSnapwalk
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
Aranclanos
1aff9034d9
Merge pull request #2943 from Aranclanos/ServerCrash
...
Server crash fix.
2014-02-28 19:42:27 -02:00
Aranclanos
b565b2125e
Server crash fix.
2014-02-28 13:20:15 -03:00
hornygranny
ac8763227b
Slightly sped up cuffing to compensate
2014-02-27 11:07: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
ChuckTheSheep
21d621c049
Merge remote-tracking branch 'upstream/master' into TC-Green-Text
2014-02-25 20:19:32 -05:00
ChuckTheSheep
6cc3055714
Uses compiled list for uplinks
2014-02-25 17:53:30 -05:00
Razharas
56f94f59da
Merge branch 'master' of https://github.com/tgstation/-tg-station into PartBag
2014-02-25 05:05:22 +04:00
AlexanderUlanH
7de04b6c3c
Merge branch 'master' into spaceareas
2014-02-24 17:47:19 -05:00
Razharas
ba54bd940b
Conflict fix
2014-02-24 22:12:02 +04:00
ChuckTheSheep
0d1bcfb336
Moved images to top "survived" line
2014-02-24 11:14:08 -05:00
Aranclanos
86cf992202
Merge pull request #2866 from hornygranny/violinsamples
...
Violin de-headaching
2014-02-24 14:07:24 -02:00
Razharas
d8f12f0680
Merge pull request #2836 from Cheridan/hydro
...
Drying Rack as smartfridge
2014-02-24 07:56:17 -08:00
Razharas
876950a3cd
Issues fixings
...
Yep
2014-02-24 15:53:24 +04:00
ChuckTheSheep
82cfa679b4
Made Purchase Log Text rather than List
2014-02-24 04:01:38 -05:00
ChuckTheSheep
6ecb511a24
TC use count appears on round end
2014-02-23 23:43:45 -05:00
