Commit Graph

1044 Commits

Author SHA1 Message Date
oranges
4348a9fb54 Merge pull request #17789 from coiax/fix-17782
Fixes #17782 and #17807; KA now can't be spam reloaded, spam improved
2016-05-21 22:50:26 +12:00
Jack Edge
490dacf586 Fixes the other thing 2016-05-20 17:10:38 +01:00
Cheridan
23d8de67c9 Merge pull request #17445 from bgobandit/ayygentb
Adds BZ, a hallucinogenic gas. [MAP EDIT]
2016-05-19 18:14:18 -05:00
bgobandit
d430ca29ab fixes the bugs of the jordie 2016-05-18 14:27:26 -04:00
AnturK
4b426eccd1 Merge pull request #17698 from coiax/mehki-did-it
KA rebalance; brings back holding a satchel
2016-05-18 18:03:12 +02:00
bgobandit
b94ce1968b Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb
Conflicts:
	_maps/map_files/MetaStation/MetaStation.dmm
2016-05-18 03:13:37 -04:00
Jack Edge
462aa7782a KA rebalance; brings back holding a satchel
Fixes #17203.

🆑 coiax
rscadd: Kinetic accelerators only require one hand to be fired, as before
rscdel: Kinetic accelerators recharge time is multiplied by the number of KAs that person is carrying.
rscdel: Kinetic accelerators lose their charge quickly if not equipped or being held
rscadd: Kinetic accelerator modkits (made at R&D or your local Free Golem
ship) overcome these flaws
/🆑

Effects on people who just use one kinetic accelerator: *They can now
carry a mining satchel in the off hand again.*
Effects on people who want to dual wield them both at once: They can do
this, but they recharge twice as slow, so no increase in DPS.
Effects on people who quasi-dual wielded by swapping them in and out of
the backpack: Now treated the same as dual wielders.

And as before, modkits mean you can properly dual wield KAs.
Mining cyborgs are unaffected.
2016-05-17 00:38:29 +01:00
PKPenguin321
5cce6a6d50 eliminates a hard tell in microlaser desc (#17669) 2016-05-16 09:48:40 -05:00
bgobandit
eaf93e34cd Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb
Conflicts:
	_maps/map_files/MetaStation/MetaStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2016-05-15 17:19:14 -04:00
TechnoAlchemist
4705efa6da Adds new items to the mining vendors. (#17362)
* Adds new items to the mining vendors, also adds tracking implanter since that didn't exist before.

* woops

* Fixes tracking implants for miners, makes medipens not OD you on tricord.

* Actually doesn't OD on tricord now

* Chemical changes.

* Upgraded the jaunter into the wormhole lifebelt

🆑 coiax
rscadd: The Free Golems have developed the jaunter into the  wormhole
lifebelt, which automatically teleports the user when they fall in a
chasm or suffer a major medical emergency. Must be worn on the belt to work.
/🆑

Please don't mistake a random teleportation in crit for saving a user's
life, the Supply channel gets a notification, but suit sensors are
required to find them, and there's no guarantee the location picked is
safe (for example, the Toxins Test Site is a valid jaunt destination,
along with in the middle of the slime cages in Xenobiology).

* Adds modification kit.

* Golem ship now has its own /area

And a bluespace beacon.

* 5 tick medijaunt, no radio, golem jaunters + areas

The number of ticks before a medical emergency jaunt happens is now
five. No radio message is produced.

Free Golems now have no restrictions on what they can purchase. Wormhole
jaunters now specifically drop golems near their ship.

* Modkits remove the race restrictions from KAs.

* Buffs buffs buffs

I'd say something, but I'm sure I'd regret it later.

* Advanced lifebelts, golem superiority

* Removes modkit from minervendors, adds modkit to RnD!

* COMPILE DAMN YOU!!

* I made it compile

* Honor to my country, not to you :(

* fuck

* h-haha?

* Kor you know I would never actually ban you

* i could personally care less for HBls adminning style
2016-05-11 22:19:47 -05:00
Robustin
d1a2d1d0bd SLIP-SANITY (#17096)
* Chemo

* CHEMO

* Chemo

* Update growninedible.dm

* Corrected math

* decimals needs 0's

* NOW EVERYBODIES HAPPY YAYYY

* Updated Botany nerf

* Conflict correction & tweaks
2016-05-10 22:52:05 -05:00
bgobandit
8d1a1fe432 Merge branch 'master' of https://github.com/tgstation/-tg-station into ayygentb
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2016-05-10 01:14:44 -04:00
bgobandit
134b809fd1 scrubbers, human life.dm, map edits, etc 2016-05-09 18:04:20 -04:00
Joan Lung
85bc1ecb26 Merge pull request #17416 from coiax/pai-boot-noise
pAI card plays a noise when personality is loaded
2016-05-06 19:47:11 -04:00
phil235
68da092009 Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior. 2016-05-05 18:17:51 +02:00
Jack Edge
34afa1a98e pAI card plays boot_noise when personality loaded
- Added pai_boot.ogg sound file

https://www.freesound.org/people/jalastram/sounds/317638/

- Uses pai_boot.ogg noise when personality loads
2016-05-05 15:56:05 +01:00
Jordie
53fd10c54b Merge pull request #17256 from tgstation/revert-17086-planes_on_a_snake
Revert "Move some stuff from different layers to different planes"
2016-04-30 15:34:17 +10:00
Cheridan
d662b0e455 Merge pull request #17218 from phil235/FixTalkingInPipes
No longer deaf while inside pipes
2016-04-29 20:34:03 -05:00
KorPhaeron
0bbcc00c4d Revert "Move some stuff from different layers to different planes" 2016-04-29 16:07:23 -05:00
phil235
750eaa4a57 invisibility = 100 and 101 now use defines. 2016-04-29 01:00:05 +02:00
phil235
d5af5ca696 Objects with invisibility = 101 are ignored by procs like view() that are used for say() and visible_message().
Objects that are simply hidden (instead of being abstract things) now always use invisibility = 100.
This fixes not being able to hear what you say while inside a hidden gas/disposal pipe.
Fixes the t-ray scanner revealing abstract object that should never be seen, like spacevine controller.
Fixes not hearing anything during a mob transformation.
2016-04-29 00:04:40 +02:00
MrPerson
b50e0ee42c Merge branch 'master' of https://github.com/tgstation/-tg-station into planes_on_a_snake 2016-04-27 17:03:32 -07:00
Razharas
88b55ced87 Fixes chameleon projector explosion protection (#17138)
Fixes chameleon projector explosion protection
2016-04-27 17:31:54 +02:00
phil235
6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-26 21:49:51 +02:00
kevinz000
de5a214132 Fixes detection multitool (#17011)
* detectionfix

* unnessacary_things_removal

* Uranges
2016-04-26 19:49:11 +02:00
Joan Lung
ad9eec737f Merge pull request #17083 from coiax/ian-looks-very-fashionable-today
Refactors dog clothing
2016-04-25 11:46:44 -04:00
phil235
fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-24 21:22:37 +02:00
phil235
43e98079f1 Removing some comments I had left in. 2016-04-24 21:12:04 +02:00
phil235
0480790b0a Same things but with structures now. 2016-04-24 20:38:33 +02:00
phil235
0caa59b21a First commit of this big PR
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
Jack Edge
1927fc73e6 Dog fashion on the back 2016-04-24 14:40:08 +01:00
MrPerson
3f70f880ac Move some stuff from different layers to different planes
Moves everything on a 15+ layer to a plane. So now you get screen catcher (-99, was already on a plane), lighting (15), effects that ignore lighting (16), fullscreen UI effects (18), screen objects used to build the UI (19), actual equipment in the UI slots (20), and everything else (0).

Also created a file to contain plane and layer defines for hopeful eventual use.

Hopefully this doesn't change anything now but does enable some nifty new features in the future.
2016-04-24 04:03:41 -07:00
Jack Edge
d80130b6a7 Removed comments 2016-04-23 17:41:12 +01:00
Jack Edge
1329b004f2 Removes trailing return 2016-04-23 17:28:20 +01:00
Jack Edge
c420fd167a Buffs light replacer and makes easier to use
🆑 coiax
rscadd: The Janitor's Union has mandated additional features to station
light replacer devices.
rscadd: The light replacer now can be used on the floor to replace
the bulbs of any lights on that tile.
rscadd: The light replacer now eats replaced bulbs, and after a certain
number of bulb fragments (four) will recycle them into a new bulb.
tweak: The description of the light replacer is now more informative.
/🆑
2016-04-23 15:08:52 +01:00
Cheridan
c53887e4c1 Merge pull request #16987 from ChangelingRain/overlay
Makes a few things use temporary overlays
2016-04-20 12:11:58 -05:00
Nerd Lord
ff44a04f3b Makes a few things use the temporary overlays instead of doing stuff manually 2016-04-19 10:28:40 -04:00
kevinz000
e446c5b411 Definesarenice 2016-04-18 23:40:30 -07:00
kevinz000
6bd271b299 Itried 2016-04-17 20:26:55 -07:00
kevinz000
815807ae20 Lessens search range as it doesn't need to look in the entire world 2016-04-17 01:10:37 -07:00
kevinz000
715d4b22b9 Revert "Revert "Admin Detection Multitool""
This reverts commit 7dc3e70f1e.
2016-04-16 20:08:36 -07:00
kevinz000
7dc3e70f1e Revert "Admin Detection Multitool"
This reverts commit 2e49750322.
2016-04-16 20:07:59 -07:00
kevinz000
2e49750322 Admin Detection Multitool
Allows for griefing to be done in safety :^)
2016-04-16 20:07:42 -07:00
Cheridan
b1a20326ec Merge pull request #16616 from bgobandit/clownmegaphone
Gives the clown a megaphone.
2016-04-05 15:35:36 -05:00
bgobandit
dc9c725e41 Adds the clown megaphone. Standardizes megaphone font. Fixes typo. Adds self to admins.txt. 2016-04-04 02:13:33 -04:00
duncathan
a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm
2016-04-03 18:22:20 -06:00
duncathan salt
0f04ea79a0 Merge pull request #16401 from Tytynguyen/atmosrounding
Atmospheric readings are now accurate to 0.01%
2016-03-31 12:04:48 -06:00
duncathan
e86cf0f280 praise the good lord, for the game finally compiles 2016-03-29 19:04:37 -06:00
duncathan
3f1375ba39 Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	_maps/RandomZLevels/Cabin.dmm
	_maps/RandomZLevels/beach2.dmm
	_maps/RandomZLevels/caves.dmm
	_maps/RandomZLevels/research.dmm
	_maps/RandomZLevels/snowdin.dmm
	_maps/RandomZLevels/undergroundoutpost45.dmm
	_maps/map_files/DreamStation/dreamstation04.dmm
	_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
	_maps/map_files/MetaStation/MetaStation.v41I.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	_maps/map_files/generic/z4.dmm
	_maps/templates/lavaland_surface_automated_trade_outpost.dmm
	_maps/templates/lavaland_surface_biodome_winter.dmm
	_maps/templates/lavaland_surface_prisoner_crash.dmm
	_maps/templates/lavaland_surface_seed_vault.dmm
	code/controllers/subsystem/air.dm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/machinery/computer/arcade.dm
	code/game/objects/effects/aliens.dm
	code/game/objects/effects/overlays.dm
	code/game/objects/items/apc_frame.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/girders.dm
	code/game/turfs/simulated.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/mineral_floor.dm
	code/game/turfs/simulated/floor/plating.dm
	code/game/turfs/simulated/river.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/simulated/walls_reinforced.dm
	code/modules/admin/verbs/buildmode.dm
	code/modules/atmospherics/environmental/LINDA_turf_tile.dm
	code/modules/events/spacevine.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/holodeck/turfs.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/interactive.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/bot/floorbot.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/mob/mob_movement.dm
	code/modules/power/singularity/narsie.dm
	code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
	code/modules/research/server.dm
2016-03-29 14:46:06 -06:00
Tytynguyen
91f618a5a7 Atmospheric readings are now accurate to 0.01% 2016-03-26 13:43:20 -07:00