5a8eed4c32
Merge pull request #2824 from hornygranny/throw_range
...
throw_range pass
2014-02-18 16:17:13 -08: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
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
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
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
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
c07d8c23dc
Merge pull request #2645 from tkdrg/ultrahardelitebugfix
...
Bugfix for #2627
2014-02-09 23:01:14 -06:00
bf17c3328e
Asteroid Overhaul v1.0
...
Mining Equipment Locker and associated items
Asteroid map rework
Mining Mob rebalancing
Minor fixes
2014-02-09 19:51:05 -08:00
e1a0f96846
Merge branch 'master' of https://github.com/tgstation/-tg-station into bananfix
...
Conflicts:
code/game/objects/items/weapons/clown_items.dm
2014-02-09 16:39:50 +13:00
6245d00a4d
Now with 100% more procs!
2014-02-08 18:22:56 -03:00
c43ba64484
Merge branch 'master' of https://github.com/tkdrg/-tg-station into ultrahardelitebugfix
...
Conflicts:
code/game/objects/items/weapons/storage/storage.dm
2014-02-08 17:50:31 -03:00
c316ff3365
Nitpick, ho!
2014-02-08 14:58:51 -03:00
c4c88036f8
Merge pull request #2479 from KazeEspada/nukeops
...
Nuke op overhaul: part 1, the renaming. [MAP][NEEDS PLAY TESTING]
2014-02-08 09:52:20 -08:00
4ea05add26
Merge pull request #2649 from YotaXP/lighting-squared
...
Reduced the potency of carrying multiple light sources.
2014-02-08 04:13:57 -08:00
b19084569d
Merge pull request #2624 from adrix89/Fixes
...
Fixes
2014-02-08 04:03:50 -08:00
0aed48193c
Merge pull request #2626 from adrix89/slip_rework2
...
Slip rework the second encounter
2014-02-07 12:24:08 -08:00
62ede5d1ae
Merging the Asteroid Map overhaul and Mining Equipment/Locker into one pull, added Mining Scanner, changed mesons
...
Tweaks on how caves are spawned and how mobs are spawned on the asteroid
2014-02-07 00:18:45 -08:00
c0aa3b56bb
Merge branch 'master' of https://github.com/tgstation/-tg-station into SayYiffYiffIfYouAreMachineFucker
...
Conflicts:
code/game/machinery/Sleeper.dm
code/game/machinery/computer/aifixer.dm
code/modules/hydroponics/biogenerator.dm
code/modules/power/apc.dm
code/modules/research/server.dm
icons/obj/stationobjs.dmi
Yeah nah time to merge this shit behore resolving conflicts will take more than 2 hours
2014-02-06 22:05:39 +04:00
5e05401541
properly fix rune cleaning
2014-02-06 17:35:48 +02:00
02cf28a4f1
missed a rune check
2014-02-06 17:13:01 +02:00
dfa1c8c363
Fine! removed ability to clean up runes
2014-02-06 09:12:32 +02:00
Razharas
Miauw
Hornygranny
Aranclanos
Ergovisavi
Rockdtben
fleure
Cheridan
Incoming
GarrusVakarian
MrPerson
Tenebrosity
Tkdrg
Razharas
adrix89