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
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
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
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
d54ecb898d
muh spear
2014-02-15 20:13:00 -08:00
9d3f8f6a2d
second pass
2014-02-15 20:11:12 -08:00
9e14c22747
Reduces throwspeeds on all items to realistic levels.
2014-02-15 19:58:03 -08:00
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
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
cc48da1f0d
Merge pull request #2774 from Aranclanos/idedplsnerf
...
reduced a bit the damage from syndicate cards
2014-02-15 10:16:08 -06:00
663d8c2632
Merge pull request #2778 from hornygranny/throwfarce
...
Rebalanced strange throwforces
2014-02-15 14:14:48 -02:00
831f23f820
now it's finished entirely \o/
2014-02-15 16:56:12 +01:00
0328f437ff
finishes up nodrop as far as i can be arsed to
2014-02-15 16:22:25 +01:00
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
e0f74d0449
Merge pull request #2762 from Incoming5643/crushacanforjayowen
...
Jay Owen demands that this pull be merged
2014-02-15 10:26:26 +00:00
e0d0cedf36
passed over everything with throwforce
2014-02-13 18:06:50 -08:00
04aeb15af7
Rebalanced strange throwforces
2014-02-13 17:47:25 -08:00
a72eb90fdb
reduced a bit the damage from syndicate cards
2014-02-13 18:13:18 -03:00
9b8656247c
u_equip is now called unEquip PANIC
2014-02-13 20:58:33 +01:00
b8b57ff4f1
Replaced canremove with NODROP.
2014-02-13 19:52:46 +01:00
d042e2d183
Merge pull request #2754 from hornygranny/jetpack
...
Fixes #2720 jetpack storage assemblies
2014-02-13 12:01:05 -06:00
698debad08
Cleans up the trash.dm
2014-02-13 10:35:02 -05:00
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
39e67ae092
Jay Owen demands that this pull be merged.
...
Crush a can for Jay Owen.
He has leukemia, please crush a can for Jay Owen.
His only wish is to see a can crushed live in our game.
Sprites by Nienhaus
2014-02-12 21:30:44 -05:00
e602febd40
Merge pull request #2713 from Tenebrosity/the-lit-the-lit-the-lit-the-lit-the-lit
...
Fixes misc grammar issues
2014-02-12 15:17:17 -08:00
9f46d5d8f7
Accounted for ridiculous edge case
2014-02-12 14:33:27 -08:00
46f8911f45
transfer valves now dynamically update their w_class based on attached tanks
2014-02-12 14:23:34 -08:00
8c7ef19be6
Replaced before_take_item() and drop_from_inventory() with u_equip
2014-02-12 19:51:37 +01:00
d47a9a4010
Fixes https://github.com/tgstation/-tg-station/issues/2720
2014-02-12 10:48:49 -08:00
7d4b9ac173
Asteroid Overhaul - Added explosions activating Gibtonite, revised ore redemption and equipment locker code, added warning signs to the western asteroid, tweaked mob spawning a little
2014-02-11 15:21:38 -08:00
5efa91f31e
Revert "Merge pull request #2479 from KazeEspada/nukeops"
...
This reverts commit c4c88036f87893b99e37
2014-02-11 14:44:38 -06:00
ad8568b8c5
Cleans up if checks in stack examine()
2014-02-10 19:55:37 +13:00
f70c8d29d9
Fixes misc grammar issues
2014-02-10 19:46:33 +13:00
892ffd3879
Merge branch 'master' of https://github.com/tgstation/-tg-station into asteroid_overhaul
2014-02-09 22:37:20 -08:00
Cheridan
Aranclanos
Razharas
Giacomand
Sugarette
Miauw
Hornygranny
Ergovisavi
Incoming
Rockdtben
Razharas
fleure
GarrusVakarian
MrPerson
Tenebrosity