d2021e1bcd
Merge pull request #3107 from Jordie0608/dancefloorisbetterthantheprancefloor
...
Fixes wirecutters and multitools lacking attack sounds
2014-03-20 11:19:14 -05:00
a5a9c2fd68
Changed mousetrapbox desc to span
2014-03-18 15:08:49 +11:00
33e6f3f3c8
Screw off crowbar_red leave me alone
2014-03-18 11:29:46 +11:00
36f6571b56
Hitsound for wirecutters
2014-03-18 11:24:06 +11:00
a034e41f25
Removing TLE comment stamps and useless comments
2014-03-13 08:25:28 -05:00
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
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
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
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
c03052aed8
DNA injectors get DNA scanner's damage_coeff.
2014-03-11 09:23:41 -07:00
83334f07be
Merge pull request #3041 from hornygranny/balancepass
...
Buffs stun baton + classic baton
2014-03-10 20:54:25 -05:00
b6e7155a24
Changed janitor and atmos tanks slightly
2014-03-10 20:27:21 +00:00
02b8288589
Stun baton buffed, classic baton buffed
2014-03-09 16:46:55 -07:00
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
19a9717ece
Merge pull request #3010 from fleure/firtree
...
Fixed typo in Tyrant AI lawset
2014-03-09 15:15:21 -05:00
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
026c991b95
Added atmos and jani watertanks, changed nozzle types
2014-03-07 01:13:19 +00:00
4914ee6dc4
Fixed typo in Tyrant AI lawset
2014-03-06 17:18:57 +00:00
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
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
c548df264b
Conflict fix
2014-03-05 06:30:29 +04:00
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
5d30d1923e
Merge pull request #2970 from Ergovisavi/bangarang
...
Flashbang tweaks
2014-03-04 02:59:10 -06:00
5e61e9ea76
Merge pull request #2960 from hornygranny/balancepass
...
combat rebalance tweaks
2014-03-03 17:59:39 -08:00
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
f3ccaa5936
Merge conflicts fix
2014-03-03 05:42:31 +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
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
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
20901b24d0
Increases cuffing speed to match secborgs, help with shorter stuns
2014-03-01 21:00:39 -08:00
2fd5557682
Conflict fix
2014-03-02 04:14:32 +04:00
ac8763227b
Slightly sped up cuffing to compensate
2014-02-27 11:07:43 -08:00
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
21d621c049
Merge remote-tracking branch 'upstream/master' into TC-Green-Text
2014-02-25 20:19:32 -05:00
876950a3cd
Issues fixings
...
Yep
2014-02-24 15:53:24 +04:00
6ecb511a24
TC use count appears on round end
2014-02-23 23:43:45 -05:00
b27d9c7396
Added RPED, some sprites and new power cell path
...
Your dreams of big part storage and fast machine part exchange came true
14 slot R&D part-only autoseeker/picker/dropper/exchager is in
Added different sprites for better capacitors and scanning modules
Changed the power cell type to be compatible with all this machine
changing faggotry
All sprites here are codersprites so ask nien/WJ for better ones if you
want
2014-02-24 05:14:43 +04:00
8b31314cb7
Merge pull request #2806 from Incoming5643/implantsmorelikeshitplants
...
Improves the "freedom" syndicate bundle
2014-02-22 23:33:49 -06:00
c91a3a1ed5
Merge pull request #2856 from Giacom/wiki_manuals
...
[MAP] Added a new wiki manual subtype which will allow you to easily add new book/manuals which link to the wiki.
2014-02-22 23:28:04 -06:00
b44c6ffdf9
Merge pull request #2801 from Razharas/Vendors
...
Vendor fixes and stuff
2014-02-22 14:22:11 -02:00
e299b62400
Merge pull request #2817 from Sugarette/spellcheck
...
Spell check of origin_tech variables in items that no one deconstructs anyway
2014-02-20 16:25:57 -08:00
a45791e54f
Added a new wiki manual subtype which will allow you to easily add new book/manuals which link to the wiki.
...
Made the wiki books use the config's wikiurl.
Updated some information in the non-wiki manuals.
You can now specificy a book's window size, the wiki books will be given a value since they are not automatically set the window size.
2014-02-20 17:47:33 +00:00
5a8eed4c32
Merge pull request #2824 from hornygranny/throw_range
...
throw_range pass
2014-02-18 16:17:13 -08:00
b48583a587
Merge pull request #3 from Sugarette/master
...
Wonder if it works
2014-02-18 22:07:56 +03:00
3b24bb64f4
Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP
...
Conflicts:
code/modules/mob/transform_procs.dm
2014-02-18 18:22:40 +01:00
ea7318985d
Merge pull request #2714 from Ergovisavi/asteroid_overhaul
...
[MAP] Asteroid/Mining Overhaul
2014-02-17 16:44:46 -08:00
2134add41b
Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range.
2014-02-17 15:44:07 -08:00
653ec88ab8
Fixed origin_tech in experimental welding tool
2014-02-17 10:53:48 +03:00
e18d9c10c0
Fixed origin_tech in both weapons
2014-02-17 10:52:47 +03:00
a319c216b3
Fixed origin_tech in lesser scroll
2014-02-17 10:51:48 +03:00
Cheridan
Jordie0608
Rockdtben
Razharas
Emil
RandomMarine
fleure
Hornygranny
Aranclanos
Razharas
ChuckTheSheep
Ergovisavi
Giacomand
Sugarette
Miauw