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
d2e5c3a51b
Inserting lights into containers should no longer dim other lights.
2014-02-05 23:05:29 -05:00
6f202788ea
Fixes #2396 and #2395
...
- Banana peels are now grown weapons
- Banana peel slip duration is now based on their potency
- Clown spawns with a 50 potency banana, which is both regular sized and
produces a skin that's nice and slippery~
- Fixes nettle and deathnettle inhands not disappearing upon use
- Makes nettle and deathnettles use the hitsound variable instead of the
playsound proc directly. Now their hitsounds will scale in volume based
on damage done.
- Makes the banana mortar shoot potency 65 banana peels. Because
otherwise it'd shoot laughably tiny and short in slip duration potency
-1 ones.
- Moves corncobs to be grown weapons and updates their paths. Now their
size will scale based on the size of the corn that spawned them.
- Updates banan paths :)
2014-02-06 13:47:39 +13:00
6db2c59772
Reduced the potency of carrying multiple light sources.
2014-02-05 16:54:46 -05:00
61a8a25e1a
Fixes #2627 and line endings (?).
2014-02-05 15:03:15 -03:00
1e9a85b672
Merge branch 'master' of https://github.com/tgstation/-tg-station
...
Merge branch 'master' of https://github.com/tgstation/-tg-station
Spray bottles doesn't make floor wet anymore.
Wet floor nerfed
Slight soap and banana buff.
Cult runes are now cleanable by soap and space cleaner.
You can clean with holy water.
Soap cleaning and uses.
Reworked spray
Revert soap uses, if there are not easily accessible,they are fine.
Revert fixes
2014-02-04 20:00:57 +02:00
7aa8225e2a
Revert stuff keep fixes
2014-02-04 19:38:58 +02:00
bdd288174a
I love invalid paths, don't you?
2014-02-04 10:28:55 -05:00
a1104a459d
Merge branch 'hrefs-in-log' of https://github.com/Limeliz/-tg-station into hrefs-in-log
...
Conflicts:
code/game/objects/items/devices/transfer_valve.dm
2014-02-04 08:34:18 -03:00
45dd35d1a7
Merge branch 'master' of https://github.com/tgstation/-tg-station into nukeops
...
Conflicts:
_maps/map_files/tgstation.2.1.2.dmm
Resolved
2014-02-04 01:41:27 -07:00
8dc864d819
Merge pull request #2605 from Neerti/SecBeltsReloaded
...
Attempt 2: Stun Batons can now go on your belt.
2014-02-03 21:49:45 -08:00
9092bf5c1c
Merge pull request #2438 from adrix89/attack_override
...
Attack override
2014-02-03 21:31:35 -08:00
ee3b0a77ca
Merge pull request #2598 from tkdrg/morebagsyay
...
Book bags for the librarian
2014-02-03 20:20:04 -08:00
2f0ca13d45
Merge pull request #2575 from Jordie0608/truebagshavenolimitations
...
Bag of holding now holds everything
2014-02-03 10:47:44 -08:00
ad235cf18f
Merge pull request #2563 from Razharas/NewTables
...
New PR for crafting tables
2014-02-03 08:46:56 -08:00
5bfe0cbd61
Merge branch 'master' of https://github.com/tgstation/-tg-station into attack_override
...
Conflicts:
code/_onclick/item_attack.dm
2014-02-03 18:07:45 +02:00
100585b33a
Enables the baton and classic baton to go on your belt. Adds an additional slot in the belt so you won't have to make room.
2014-02-03 01:31:39 -05:00
e60ecbb1f4
Merge pull request #2590 from GarrusVakarian/issue#2436fix
...
Fixed issue #2436 (Classic baton stuns borgs)
2014-02-02 16:08:45 -08:00
f9c0e171f1
Revert soap uses, if there are not easily accessible,they are fine.
2014-02-02 20:57:51 +02:00
94bbf55ce3
Adapted code to Jordie0608's fix
2014-02-02 18:01:46 +01:00
869f4efa0a
I finally realize what was causing the click issues,so now it works with proximity flag.
2014-02-02 15:31:56 +02:00
68abd1f0e4
Merge pull request #2510 from Tenebrosity/throwsounds
...
Removes throwtapsound var from items
2014-02-02 04:33:23 -08:00
6fb71e6174
Added book bags. The librarian now spawns holding one.
2014-02-02 04:46:34 -03:00
30c4694487
Adapted to fit programming standard
2014-02-02 05:22:39 +01:00
1d54687b2b
Merge pull request #2477 from Tenebrosity/Branch_Branch_attacksounds
...
Attack sounds for all melee weapons
2014-02-01 18:01:59 -08:00
a270bb5696
Fixes projectiles hitting a target multiple times if it's thrown or simple mobs fire it
...
Adds a bunch of new miner exclusive items, miners will now spawn with a mining point card in their backpack to buy things at the locker.
Resonator and Kinetic Gun commented out from the equipment locker until mining mobs spawn by default
2014-02-01 17:11:21 -08:00
f71ffde259
Fixed issue #2436 (Classic baton stuns borgs)
2014-02-02 02:05:15 +01:00
831608e664
Increased max_combined to 35
2014-02-01 15:54:08 +11:00
782148ddd3
Soap cleaning and uses.
2014-01-31 23:26:16 +02:00
8a41cf9c69
Spray bottles doesn't make floor wet anymore.
...
Wet floor nerfed
Slight soap and banana buff.
Cult runes are now cleanable by soap and space cleaner.
You can clean with holy water.
2014-01-31 23:05:55 +02:00
f8e359cc35
Bag of holding now holds everything
2014-02-01 04:11:15 +11:00
b4f011bacb
Merge branch 'master' of https://github.com/tgstation/-tg-station into CraftingTable
...
Conflicts:
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/power/cable.dm
Fixing conflicts
2014-01-31 05:20:59 +04:00
2133f12dc4
Merge branch 'master' of https://github.com/tgstation/-tg-station into miningpoints
2014-01-30 16:37:37 -08:00
3a0d12838a
Merge pull request #2528 from RobRichards1997/28/01/2014-Cyberlimb-Sanity
...
Adds sanity checks to Robotlimb repairs [BUGFIX]
2014-01-30 10:40:12 -08:00
cb318996b5
Merge pull request #2524 from Incoming5643/ImUpset
...
Removes the "SmoothOperator" bundle
2014-01-30 10:25:26 -08:00
e766b585c1
Equipment Locker and Ore Redemption Unit v1.0
2014-01-29 11:47:34 -08:00
0851b341da
- Removes the throwtapsound var from items. It was unnecessary.
...
- Thrown items play throwhitsound on impact. If no throwhitsound is defined, they play hitsound instead. If that isn't defined, they play genhit.ogg. The latter fixes \#2508. The volume of the sound is dependant on the item's throwforce and/or weight class.
- Adds 15 throwforce to the fireaxe, which previously had only 1.
2014-01-29 10:51:14 +13:00
859d909a2b
Adds sanity checks to Robotlimb repairs
2014-01-28 17:03:25 +00:00
Tenebrosity
Tkdrg
Razharas
Ergovisavi
Razharas
adrix89
YotaXP
Neerti
Aranclanos
KazeEspada
fleure
Cheridan
GarrusVakarian
Jordie0608
Robson Richards