2fd5557682
Conflict fix
2014-03-02 04:14:32 +04:00
1aff9034d9
Merge pull request #2943 from Aranclanos/ServerCrash
...
Server crash fix.
2014-02-28 19:42:27 -02:00
b565b2125e
Server crash fix.
2014-02-28 13:20:15 -03: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
011a78f478
Merge pull request #2902 from Miauw62/actualbranchnamesyounerd
...
Fixes NODROP not playing nice with tables.
2014-02-25 22:37:09 -06:00
004b005ab2
Merge pull request #2901 from Miauw62/aijgdiajgiojdaigjapgijsgdipjagiojaranisafagaidpjgiaopjgdoiadjgaipgjpijadgijagipjadijigpaijgdipajgdipajdgpiadjgpajgd
...
Fixed #2899 (NODROP and closets doing weird shit)
stop making retarded branch names miauw
2014-02-25 22:29:39 -06:00
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
56f94f59da
Merge branch 'master' of https://github.com/tgstation/-tg-station into PartBag
2014-02-25 05:05:22 +04:00
7de04b6c3c
Merge branch 'master' into spaceareas
2014-02-24 17:47:19 -05:00
41a9321d2a
rip in peace more parems
2014-02-24 19:43:09 +01:00
27d0b64032
Fixes NODROP not playing nice with tables.
...
(thx for submitting bug reports guise)
2014-02-24 19:38:10 +01:00
8ed2cdb07a
Fixed #2899
2014-02-24 19:25:57 +01:00
ba54bd940b
Conflict fix
2014-02-24 22:12:02 +04:00
86cf992202
Merge pull request #2866 from hornygranny/violinsamples
...
Violin de-headaching
2014-02-24 14:07:24 -02:00
d8f12f0680
Merge pull request #2836 from Cheridan/hydro
...
Drying Rack as smartfridge
2014-02-24 07:56:17 -08:00
3d90e8815e
Merge pull request #2827 from Ergovisavi/muh_vision
...
Adding NVG's/Advanced Mesons to the protolathe, some human vision changes
2014-02-24 07:55:34 -08:00
876950a3cd
Issues fixings
...
Yep
2014-02-24 15:53:24 +04: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
89170dd6d9
Merge pull request #2867 from Aranclanos/hardestfix
...
Smoke effect runtime fix.
2014-02-22 13:12:11 -06:00
b44c6ffdf9
Merge pull request #2801 from Razharas/Vendors
...
Vendor fixes and stuff
2014-02-22 14:22:11 -02:00
8af22aeeac
Merge pull request #2861 from hornygranny/muhspans
...
Fixes #2726 , #2729
2014-02-21 20:39:58 -06:00
8ca49d5e90
Fixes a small runtime related to deleting smoke that doesn't exist after a spawn()
2014-02-21 08:30:46 -03:00
0d648c6d8a
no more headaches
2014-02-21 01:20:46 -08:00
c31c76b4ab
Quick fix for tables, lockers and general drop_item
...
Shall do the trick
2014-02-21 05:15:40 +04: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
ed12a9cfb0
missing exclamation points
2014-02-20 12:41:23 -08:00
a86de57c05
Fixes #2726
2014-02-20 12:11:00 -08:00
95bc337d62
A lot of Stuff From: #2849
...
https://github.com/tgstation/-tg-station/pull/2849
2014-02-20 13:28:07 -05: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
03e186bc19
Remove other namecheck
2014-02-19 20:29:25 -05:00
1d6981c2d3
Remove name checks
2014-02-19 17:23:57 -05:00
5a8eed4c32
Merge pull request #2824 from hornygranny/throw_range
...
throw_range pass
2014-02-18 16:17:13 -08:00
839ee11308
Merge branch 'master' of https://github.com/tgstation/-tg-station into hydro
...
Conflicts:
code/game/machinery/drying_rack.dm
2014-02-18 15:25:16 -06:00
8f509fc4b2
drying rack as smartfridge
...
Converts the drying rack into a smart fridge, allowing for better usability (can now batch-dry), code cleanliness and reuse.
2014-02-18 15:16:40 -06: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
62ab59b128
Changed the typepath of HUD sunglasses to be a child of the security hud
...
Removed all the istype checks for glasses in humans
Added advanced mesons (Old meson functionality of removing darkness overlay) and NVG's to the protolathe
2014-02-17 21:00:46 -08: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
b78c7eca06
Merge pull request #2809 from hornygranny/throwspeed
...
throwspeed pass
2014-02-17 06:26:06 -02: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
c16be9dfc5
Changed toy double saber's origin tech to null
2014-02-17 10:50:28 +03:00
c5488cc6ce
Replaced empty string with null in origin_tech
...
Changed it to keep in line with what seems to be a standard.
2014-02-17 10:47:21 +03:00
2286d6dc61
Merged two lines with origin_tech
...
One used to overwrite the other.
2014-02-17 10:44:00 +03:00
1749d38d56
Merge branch 'master' of https://github.com/tgstation/-tg-station into asteroid_overhaul
...
Fixed possible runtime issue with Jaunters, fixed merge issues, changed mining points to examine from attack self
2014-02-16 19:36:48 -08:00
Razharas
Aranclanos
hornygranny
Cheridan
AlexanderUlanH
Miauw
Razharas
Rockdtben
ChuckTheSheep
Giacomand
Sugarette
Ergovisavi