Commit Graph

2555 Commits

Author SHA1 Message Date
Cheridan 8b31314cb7 Merge pull request #2806 from Incoming5643/implantsmorelikeshitplants
Improves the "freedom" syndicate bundle
2014-02-22 23:33:49 -06:00
Cheridan 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
Cheridan 89170dd6d9 Merge pull request #2867 from Aranclanos/hardestfix
Smoke effect runtime fix.
2014-02-22 13:12:11 -06:00
Aranclanos b44c6ffdf9 Merge pull request #2801 from Razharas/Vendors
Vendor fixes and stuff
2014-02-22 14:22:11 -02:00
Rockdtben 8af22aeeac Merge pull request #2861 from hornygranny/muhspans
Fixes #2726, #2729
2014-02-21 20:39:58 -06:00
Aranclanos 8ca49d5e90 Fixes a small runtime related to deleting smoke that doesn't exist after a spawn() 2014-02-21 08:30:46 -03:00
Razharas c31c76b4ab Quick fix for tables, lockers and general drop_item
Shall do the trick
2014-02-21 05:15:40 +04:00
Razharas 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
hornygranny ed12a9cfb0 missing exclamation points 2014-02-20 12:41:23 -08:00
hornygranny a86de57c05 Fixes #2726 2014-02-20 12:11:00 -08:00
Giacomand 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
Razharas 5a8eed4c32 Merge pull request #2824 from hornygranny/throw_range
throw_range pass
2014-02-18 16:17:13 -08:00
Sugarette b48583a587 Merge pull request #3 from Sugarette/master
Wonder if it works
2014-02-18 22:07:56 +03:00
Miauw 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
Razharas ea7318985d Merge pull request #2714 from Ergovisavi/asteroid_overhaul
[MAP] Asteroid/Mining Overhaul
2014-02-17 16:44:46 -08:00
Hornygranny 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
Aranclanos b78c7eca06 Merge pull request #2809 from hornygranny/throwspeed
throwspeed pass
2014-02-17 06:26:06 -02:00
Sugarette 653ec88ab8 Fixed origin_tech in experimental welding tool 2014-02-17 10:53:48 +03:00
Sugarette e18d9c10c0 Fixed origin_tech in both weapons 2014-02-17 10:52:47 +03:00
Sugarette a319c216b3 Fixed origin_tech in lesser scroll 2014-02-17 10:51:48 +03:00
Sugarette c16be9dfc5 Changed toy double saber's origin tech to null 2014-02-17 10:50:28 +03:00
Sugarette 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
Sugarette 2286d6dc61 Merged two lines with origin_tech
One used to overwrite the other.
2014-02-17 10:44:00 +03:00
Ergovisavi 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
Incoming 8d1f579de1 Renames the "freedom" bundle the "implant" bundle cause that's what it is, man.
The freedom implant is now shrugs only, and the emp implant can now not be shrugs.
The freedom implant now has an assured 4 uses instead of rand 1 to 5 because... why?
Adds an explosive implant to the bundle, and labels it since there's a good chance the traitor would rather use it on someone else instead of themselves.
No F U C K S given.
2014-02-16 15:22:54 -05:00
Razharas be73e9d09f Merge pull request #2771 from fleure/eggs
Increased egg hatch rate and reduced chicks in crate
2014-02-16 08:37:49 -08:00
fleure 39be0e9ffc Merge pull request #2773 from Aranclanos/jetpackfarts
ion trails runtime
2014-02-16 14:35:58 +00:00
Razharas 07d5adeb38 Merge pull request #2767 from GarrusVakarian/borgicons
Adds corresponding icons to cyborg thermal goggles, cyborg meson goggles...
2014-02-16 00:56:52 -08:00
Hornygranny d54ecb898d muh spear 2014-02-15 20:13:00 -08:00
Hornygranny 9d3f8f6a2d second pass 2014-02-15 20:11:12 -08:00
Hornygranny 9e14c22747 Reduces throwspeeds on all items to realistic levels. 2014-02-15 19:58:03 -08:00
Incoming 502b9e0fcd Adds the two implants currently availble to traitors not in the implant bundle to the implant bundle.
Even with all this, it's still a pretty underwhelming bundle.
2014-02-15 16:08:52 -05:00
Miauw 3f9bf15ca5 Merge branch 'master' of https://github.com/tgstation/-tg-station into NODROP
Conflicts:
	code/modules/mob/mob.dm
2014-02-15 17:30:21 +01:00
Rockdtben cc48da1f0d Merge pull request #2774 from Aranclanos/idedplsnerf
reduced a bit the damage from syndicate cards
2014-02-15 10:16:08 -06:00
Aranclanos 663d8c2632 Merge pull request #2778 from hornygranny/throwfarce
Rebalanced strange throwforces
2014-02-15 14:14:48 -02:00
Miauw 831f23f820 now it's finished entirely \o/ 2014-02-15 16:56:12 +01:00
Miauw 0328f437ff finishes up nodrop as far as i can be arsed to 2014-02-15 16:22:25 +01:00
Razharas 1c9a7a615f Vendor fixes
Fixes some bugs, makes vendors drop refillers on deconstruction and
generally use refillers more
2014-02-15 18:10:11 +04:00
fleure e0f74d0449 Merge pull request #2762 from Incoming5643/crushacanforjayowen
Jay Owen demands that this pull be merged
2014-02-15 10:26:26 +00:00
Hornygranny 9323c35a51 fixed disastrous and shameful failure 2014-02-13 19:16:53 -08:00
hornygranny e0d0cedf36 passed over everything with throwforce 2014-02-13 18:06:50 -08:00
hornygranny 04aeb15af7 Rebalanced strange throwforces 2014-02-13 17:47:25 -08:00
Aranclanos a72eb90fdb reduced a bit the damage from syndicate cards 2014-02-13 18:13:18 -03:00
Aranclanos e529a1ae84 small fix for an runtime related to ion trails (that smoke coming out from your jetpack when you move) 2014-02-13 18:08:41 -03:00
Miauw 9b8656247c u_equip is now called unEquip PANIC 2014-02-13 20:58:33 +01:00
Fleure cf4f6dcef2 Reduced number of possible chicks from a chicken crate 2014-02-13 19:20:14 +00:00
Miauw b8b57ff4f1 Replaced canremove with NODROP. 2014-02-13 19:52:46 +01:00
Cheridan d042e2d183 Merge pull request #2754 from hornygranny/jetpack
Fixes #2720 jetpack storage assemblies
2014-02-13 12:01:05 -06:00
Incoming 698debad08 Cleans up the trash.dm 2014-02-13 10:35:02 -05:00
GarrusVakarian 7ae97bd4f6 Adds corresponding icons to cyborg thermal goggles, cyborg meson goggles, cyborg medical HUD and cyborg security HUD.
Fixes issue #2635
2014-02-13 15:37:55 +01:00