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
c0
2b6128d56e
Kills PDA snowflakey close button
2016-03-21 07:38:33 +03:00
duncathan
12a6205372
Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
...
Conflicts:
_maps/RandomRuins/SpaceRuins/asteroid4.dmm
_maps/RandomRuins/SpaceRuins/spacebar.dmm
_maps/RandomZLevels/Academy.dmm
_maps/RandomZLevels/beach.dmm
_maps/RandomZLevels/caves.dmm
_maps/RandomZLevels/research.dmm
_maps/RandomZLevels/snowdin.dmm
_maps/RandomZLevels/spacebattle.dmm
_maps/RandomZLevels/undergroundoutpost45.dmm
_maps/RandomZLevels/wildwest.dmm
_maps/map_files/AsteroidStation/AsteroidStation.dmm
_maps/map_files/BirdStation/BirdStation.dmm
_maps/map_files/DreamStation/dreamstation04.dmm
_maps/map_files/DreamStation/z5.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/map_files/generic/z5.dmm
_maps/map_files/generic/z6.dmm
_maps/templates/lavaland_surface_prisoner_crash.dmm
_maps/templates/lavaland_surface_seed_vault.dmm
_maps/templates/lavaland_surface_ufo_crash.dmm
code/game/asteroid.dm
code/game/atoms.dm
code/game/gamemodes/cult/runes.dm
code/game/gamemodes/malfunction/Malf_Modules.dm
code/game/machinery/computer/arcade.dm
code/game/objects/structures/lattice.dm
code/game/turfs/simulated/floor/fancy_floor.dm
code/game/turfs/simulated/floor/misc_floor.dm
code/game/turfs/simulated/floor/plasteel_floor.dm
code/game/turfs/simulated/walls_misc.dm
code/game/turfs/turf.dm
code/modules/events/spacevine.dm
code/modules/mining/mine_turfs.dm
code/modules/mob/living/living.dm
code/modules/mob/living/silicon/robot/robot.dm
code/modules/mob/living/simple_animal/bot/cleanbot.dm
code/modules/mob/living/simple_animal/bot/mulebot.dm
code/modules/mob/mob_movement.dm
2016-03-10 23:07:21 -06:00
duncathan
5bf31463da
removes simulated turfs; adds space gas mixture for space
2016-03-10 17:27:01 -06:00
Jordie
32bf31f3a0
Merge pull request #15707 from Core0verload/breathing_implant
...
[Ready] New cyberimplant: breathing tube
2016-02-29 14:53:42 +11:00
tkdrg
77b7f02bdd
Merge pull request #15775 from AnturK/fix1
...
Bunch of fixes
2016-02-27 21:27:08 -03:00
AnturK
59774fc0fb
Fixes some other ghost interaction issues.
2016-02-26 23:13:13 +01:00
c0
6e4d3c05a0
fix
2016-02-26 08:44:08 +03:00
c0
eb7cad946a
PDA subtypes are moved from PDA.dm to PDA_types.dm
2016-02-26 06:08:39 +03:00
c0
6c9be9c82d
Adds breathing tube implant, changes how heart works, reworks arm-mounted implants
2016-02-25 12:50:45 +03:00
AndrewJacksonThe2nd
38f3f1dada
Merge branch 'master' of https://github.com/tgstation/-tg-station into PARANOIA
...
Conflicts:
code/game/objects/items.dm
code/modules/clothing/masks/gasmask.dm
code/modules/clothing/under/chameleon.dm
2016-02-23 21:06:36 -08:00
phil235
0ec876d9fe
Refactored the item's action system. Items can now hold multiple actions.
...
The "set internals" button of tank items now turn green when it's used as internals.
Removed research scanner from drones (since cyborgs don't have it, it's more consistent)
Removed the ignore_madkadjust mask var.
The sechailer mask now has an adjust mask action button, so I removed the adjust verb that it was using.
The item's action are now created on item/New() instead of trying to create it every time someone picks the item up.
I split hud/action.dm, the datum/action stuff is now in the datum folder (/datum/action.dm), whereas the code for action buttons is kept in the hud folder under action_button.dm. Also I moved some /datum/action code that was in some files back into datum/action.dm where it belongs.
2016-02-23 19:37:42 +01:00
AndrewJacksonThe2nd
583c2c3dea
Fixes
2016-02-21 15:46:16 -08:00
phil235
91839f5f70
Action buttons will now only update when needed instead of every Life().
...
The action buttons now update their icon instantly.
Fixes versions of pickup(),equipped() and dropped not calling the parent.
Fixes drone not being able to remove a defib from their storage.
You can now cycle the mime mask by clicking it in your hand.
The action buttons for hardsuit and hooded suits now only appears when you're wearing the suit.
Created two mob helper procs getBeltSlot() and getBackSlot().
Created /datum/species/proc/on_species_loss() to handle stuff when our race change, currently only used by jelly and slime race to remove their exotic blood from our reagents and to remove slime people's action buttons.
2016-02-22 00:34:59 +01:00
xxalpha
7c0c66dba3
Merge remote-tracking branch 'upstream/master' into urange
2016-02-17 14:21:29 +00:00
Bjorn Neergaard
0f89670107
Prevent picking up anchored items
2016-02-12 01:00:55 -06:00
Bjorn Neergaard
ad6f0cb157
Fix some poor intercom code
2016-02-12 00:11:50 -06:00
