04018648d1
Merge branch 'master' of https://github.com/tgstation/-tg-station into FixGib
...
Conflicts:
code/modules/mob/living/death.dm
code/modules/mob/living/simple_animal/simple_animal.dm
2016-04-30 12:30:36 +02:00
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
d662b0e455
Merge pull request #17218 from phil235/FixTalkingInPipes
...
No longer deaf while inside pipes
2016-04-29 20:34:03 -05:00
0bbcc00c4d
Revert "Move some stuff from different layers to different planes"
2016-04-29 16:07:23 -05:00
7900f80544
Merge branch 'master' of https://github.com/tgstation/-tg-station into FixAlienStructureProjDodge
...
Conflicts:
code/game/objects/structures/aliens.dm
2016-04-29 20:58:02 +02:00
b1c1925b7c
Change gib animation sprites to only loop once.
2016-04-29 20:48:56 +02:00
6fc1d4fde4
Blobs can no longer eat the supermatter ( #17205 )
...
* Blobs can no longer eat the supermatter
* phil'd
* phil'd
2016-04-29 20:29:20 +02:00
9b5950000e
overlay effect should be immune to explosions.
2016-04-29 04:21:08 +02:00
2cc2341536
Fixes runtime when using gibself on an animal.
...
Fixes gib animation never appearing for carbons.
gib() now has a "no_organs" argument to not spill organs on gib().
gib() also no longer waits for the gib animation to finish before actually qdeling the mob (which was causing the possibility of multi-gibbing animation during cult sacrifice.
Gibself no longer spill organs.
Simple_animal no longer show "X stops moving" when gibbed.
2016-04-29 03:57:16 +02:00
750eaa4a57
invisibility = 100 and 101 now use defines.
2016-04-29 01:00:05 +02:00
be57a223b5
Moves alien structure into the proper folder objs/structures/aliens.dm
...
Removes incorrect comment about forcedodge projectile.
2016-04-28 22:44:26 +02:00
b50e0ee42c
Merge branch 'master' of https://github.com/tgstation/-tg-station into planes_on_a_snake
2016-04-27 17:03:32 -07:00
bb1f60e769
Fixes typos and errors I made.
...
Fixes unscrewing a broken computer only dropping one glass shard instead of two.
Fixes AI holopad, recharger, keycard authentication device, reagent_dispensers reagentgrinder, and APC not being attackable.
Fixes APC cover knockdown being random, it now uses the take_damage() proc, which also allows animals and xenos to knock down the cover of a broken apc.
2016-04-25 22:29:17 +02:00
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
0480790b0a
Same things but with structures now.
2016-04-24 20:38:33 +02:00
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
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
3c8a3b08db
Merge pull request #17021 from Core0verload/gluves
...
Replaces fake insulated gloves with cheap insulated gloves in maint drop
2016-04-23 10:44:52 -05:00
4df060ccc2
Merge pull request #16700 from Bawhoppen/smallspawnerchanges
...
Removes salt-shaker from maint loot
2016-04-21 00:28:06 -05:00
417902badc
Replaces fake Insulated Gloves with cheap Insulated Gloves in maint drop
2016-04-21 08:06:42 +03:00
ec001cf1d9
Merge pull request #16952 from Core0verload/meme-out
...
i was the antiskub all along
2016-04-20 17:56:59 -05:00
ff44a04f3b
Makes a few things use the temporary overlays instead of doing stuff manually
2016-04-19 10:28:40 -04:00
c9926867d1
Final Solution for one shitty meme
2016-04-19 11:02:56 +03:00
88110f726d
Charger holocarp will now color the trail properly
2016-04-17 19:06:02 -04:00
6725a2e682
Membrane change, dropper nerf
...
- Droppers now only work on human mobs
- Resin membranes now block lasers.
2016-04-07 18:04:12 -05:00
739bde72c4
no more salt
2016-04-07 01:08:23 -05:00
afbe7c0dcc
Merge remote-tracking branch 'remotes/upstream/master' into WJ_Likes_To_Inspect_His_Xenos
...
# Conflicts:
# code/game/objects/effects/aliens.dm
2016-04-06 14:10:07 -05:00
5098a3c884
Made more sleeps use stoplag
...
This buffs a few things, but makes them handle lag better and tick at the rate of world.tick_lag without causing lag
2016-04-05 11:08:28 -07:00
90cb067020
Merge pull request #16621 from duncathan/atmosspawnair
...
Makes atmos_spawn_air() use the new gas string parser
2016-04-05 11:38:12 -05:00
591aacfcc5
Merge pull request #16527 from ChangelingRain/thisiskorsfault
...
Fixes minerals not spreading
2016-04-04 18:20:21 -05:00
d5a0f12ae3
Merge pull request #16438 from Bawhoppen/imrunningoutofnamesforbranches
...
A few new maint lootspawner additions
2016-04-04 18:02:57 -05:00
c33af31bf6
Merge remote-tracking branch 'remotes/upstream/master' into WJ_Likes_To_Inspect_His_Xenos
...
# Conflicts:
# code/game/objects/effects/aliens.dm
2016-04-04 11:56:07 -05:00
d5a9fc1319
IT IS DONE
2016-04-04 10:31:13 -04:00
497a4efc70
makes atmos_spawn_air() use the new gas string parser
2016-04-04 01:49:09 -06:00
7d5dce7e10
this, on the other hand, is byond's fault
2016-04-01 20:10:07 -04:00
eeb0119acb
Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
...
Conflicts:
code/game/gamemodes/nuclear/nuclearbomb.dm
code/modules/mob/mob_movement.dm
code/modules/recycling/conveyor2.dm
2016-03-30 22:55:00 -06:00
5ff2020202
Merge pull request #16357 from Iamgoofball/fast
...
Foam and Conveyor Belts now process as fast as possible, Adds the Fast Process subsystem
2016-03-29 20:06:55 -06:00
e86cf0f280
praise the good lord, for the game finally compiles
2016-03-29 19:04:37 -06:00
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
b9950c4358
turf/open and turf/closed
2016-03-29 13:38:56 -06:00
36aedd1da2
Phase 1
...
- Adds skeleton code for airlock forcing
- Buffs Drone health
- Reduces alium growth times
- Buffs alien window health
2016-03-29 12:44:22 -05:00
7a109c5fd0
neutrality preserved
2016-03-27 23:46:49 -05:00
275b3dcc96
lootspawner additions
2016-03-27 23:37:45 -05:00
40e766c6d0
AAAAAAAAAAAAAAAAA
2016-03-27 12:04:33 -07:00
095bede7ed
Merge pull request #16334 from ChangelingRain/parasitic
...
Adds assassin holoparasites
2016-03-25 19:24:28 -05:00
f54132e74b
Foam and Conveyor Belts now process as fast as possible, Adds the Fast Process subsystem
2016-03-25 03:56:01 -07:00
6a00b7eebb
Merge pull request #16303 from ChangelingRain/weedsmoothing
...
Removes a line that broke weed smoothing on destruction
2016-03-24 17:31:14 +01:00
5dea8ebca1
Adds assassin holoparasites
...
Assassin holoparasites can go invisible, causing their next attack to do massive damage and ignore armor.
The stealth will be broken by attacking or taking damage.
2016-03-24 12:08:09 -04:00
63aa7358f4
Merge pull request #16291 from ChangelingRain/holobuff
...
Buffs lightning holoparasite to not be total shit
2016-03-23 21:13:17 -06:00
4ab87e60cf
tis all
2016-03-23 16:38:04 -04:00
phil235
Jordie
Cheridan
KorPhaeron
Joan Lung
phil235
MrPerson
c0
GunHog
Lularian
MrStonedOne
duncathan
bawhoppen
AndrewJacksonThe2nd
AnturK