Cheridan
581a755ae5
Merge pull request #17269 from Core0verload/supplytimer
...
Drops supply shuttle delay to 1 minute
2016-05-02 00:01:46 -05:00
c0
1cba0fbcdc
Drops supply shuttle delay to 1 minute
2016-04-30 07:26:29 +03:00
Cheridan
d662b0e455
Merge pull request #17218 from phil235/FixTalkingInPipes
...
No longer deaf while inside pipes
2016-04-29 20:34:03 -05:00
Cheridan
fbd16c77cd
Merge pull request #16934 from Core0verload/cargo
...
Changes to Stocks Console UI, cargo fixes
2016-04-28 23:22:17 -05:00
phil235
750eaa4a57
invisibility = 100 and 101 now use defines.
2016-04-29 01:00:05 +02:00
Jack Edge
70e59d729f
Increases cargo shuttle time back to two minutes
2016-04-28 20:11:52 +01:00
Jack Edge
e01a74f8b8
Blend in with the others
2016-04-28 12:38:47 +01:00
Jack Edge
6af0e2a0dc
Cargo shuttle now arrives in 2 minutes
2016-04-27 17:35:34 +01:00
phil235
b7da04e8c8
You can now use your PDA on the emergency shuttle console.
2016-04-26 21:43:11 +02:00
phil235
b146131a34
Second commits.
...
This contains the changes to item_attack.dm
Obj/attackby() now follows a similar structure as mob/living/attackby. It calls attack_obj() (like attack() but for obj) which calls attacked_by (just like attack() does)
The use of the NOBLUDGEON flag changes a bit, it is now used to signify the item cannot be used as a melee weapon at all. No attack animation, no attack message. I've given this bitflag to many items that have an afterattack() so as to not both attack and do the special action (among those items: the rcd)
There's also the code changes to attacking machines: attacking any machine now give a proper message and a sound. And with this, I made more machines breakable (using a health var and the very little used BROKEN stat). Most notably, tables can now be attacked when on harm intent and be destroyed.
The newly destroyable machines have a take_damage() proc used by all sorts of attack (weapon, xeno, animal, hulk, mech melee, gun projectile, thrown items).
There's some more stuff in there, see the PR's description and comments.
2016-04-24 20:37:00 +02:00
c0
4d998af43a
Changes to Stocks UI, Cargo fixes
2016-04-17 04:40:06 +03:00
c0
04f1aafa78
Exports
2016-04-13 06:01:40 +03:00
Core0verload
04ce5e42cd
World "?status" expansion, Topic() rework
...
* World "?status" expansion
* New helper procs for shuttles
* fix
* a fix
2016-04-06 02:15:25 -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
duncathan
b9950c4358
turf/open and turf/closed
2016-03-29 13:38:56 -06:00
Cheridan
0288f7c592
Merge pull request #16067 from xxalpha/silky_smooth
...
icon smooth ss
2016-03-15 04:59:48 -05:00
KorPhaeron
24eb9bd457
White ship can land on lavaland
2016-03-14 14:44:55 -05:00
xxalpha
688137c7dc
icon smooth ss
...
adjustments
adjustements
atharrachaidhean
2016-03-12 23:57:45 +00:00
KorPhaeron
2bb3f668c2
Merge
2016-03-12 15:03:57 -06:00
KorPhaeron
05c3b2d07b
Test
2016-03-10 22:41:27 -06:00
duncathan
5bf31463da
removes simulated turfs; adds space gas mixture for space
2016-03-10 17:27:01 -06:00
bgobandit
4cbe9306ae
ishuman
2016-03-07 07:16:21 -05:00
bgobandit
82de663bc8
Shuttle collisions now deal damage to the chest and head for human mobs, gib all other mobs.
2016-02-27 18:13:33 -05:00
Bjorn Neergaard
39421efeb3
Address feedback
2016-02-08 07:22:18 -06:00
Bjorn Neergaard
fd5b61a156
Implement robust cargo logging
2016-02-08 04:28:19 -06:00
Bjorn Neergaard
401fe06e1c
Fix two small errors
2016-02-08 00:01:54 -06:00
Bjorn Neergaard
4ef2667ff2
Rewrite supply packs/cargo orders
2016-02-07 04:45:55 -06:00
Bjorn Neergaard
ddab6823d3
Fix up crates
...
All shipable crates are proper children
All crates support a manifest
Crates rely on parent code shared with closets when possible
2016-02-07 01:20:37 -06:00
Bjorn Neergaard
ede93b63a6
Put shuttles in their proper place, split out secure crates
2016-02-07 01:18:56 -06:00
Bjorn Neergaard
6f05af73a3
Fix shuttles not correctly buying/selling
...
Empty crates are now sold properly, as well as being sold
only when centcomm is reached
2016-02-06 02:01:38 -06:00
Bjorn Neergaard
9386602acf
tgui cargo console
...
rewrite awful shuttle/cargo code a lot as well
2016-02-05 17:06:07 -06:00
Bjorn Neergaard
9783f47514
Centralize shuttle computers
2016-02-05 17:06:04 -06:00
tkdrg
7891ac2805
Merge pull request #15034 from AnturK/shuttle_templates
...
Adds map template datum and size preloading
2016-01-31 13:33:30 -03:00
tkdrg
41fd154e3f
Merge pull request #14996 from KorPhaeron/white_ship
...
Allows you to use the abandoned white ship as an escape shuttle
2016-01-30 01:25:40 -03:00
AnturK
8999db80b4
Fixes shuttles loading improperly in templates
...
Adds template datum and preloader
2016-01-29 20:51:12 +01:00
KorPhaeron
77330ccd1f
Shuttle Launch
2016-01-27 23:17:55 -06:00
Firecage
7f96592b87
Merge Conflict Fix
2016-01-27 13:29:38 +02:00
duncathan salt
f92066b478
Fixes whiplash from shuttle docking while buckled
2016-01-23 09:55:23 -06:00
duncathan salt
7cdf700fb8
Compile fix part 1
2016-01-20 08:58:51 -06:00
duncathan
b45b9ef363
pipes don't transport air across time and space
2016-01-19 23:14:15 -06:00
Firecage
0cb6814c18
Merge conflict fix
2016-01-17 19:15:30 +02:00
Firecage
754491ce4c
Changes relatives paths into absolute paths and makes some if()'s better
2016-01-17 01:36:56 +02:00
AnturK
23efe5f675
Adds a variable to block shuttles from changing destinations midflight for mining shuttle
2016-01-09 17:44:16 +01:00
MrStonedOne
fd80575f38
Removes a bunch of sleep(-1) and spawn(-1) from the code
...
This seems to be causing issues where if the queue was too long, byond would attempt to process through all of it while hanging everything else.
2016-01-04 15:17:12 -08:00
MrStonedOne
b50e8d2a63
removes a bunch of unneeded spawns
...
spawns have a high overhead.
I only went for easy targets, almost every spawn could be removed with a few subsystems in place to handle delays or cooldowns
2016-01-02 18:23:02 -08:00
oranges
134a76cc8f
Line ending apocalypse
2015-12-17 14:12:37 +13:00
KorPhaeron
32e713b1b3
Doesn't move stuff either
2015-12-15 15:17:04 -06:00
KorPhaeron
aeb29a28d0
Shuttle tweaks
2015-12-15 14:33:30 -06:00
AnturK
d71e310390
Makes shuttle turf copy use proper helper.
2015-11-25 21:19:36 +01:00
