ccomp5950
6736fb54e7
Merge branch '_base-turf' of https://github.com/mwerezak/Baystation12 into dev
...
Conflicts:
code/game/area/Space Station 13 areas.dm
2015-12-17 20:25:36 -05:00
PsiOmegaDelta
185faaeb82
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/game/turfs/turf.dm
code/modules/mob/living/carbon/human/examine.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/mob_grab_specials.dm
2015-12-08 08:23:10 +01:00
PsiOmegaDelta
5fcf13ac55
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/surgery_limbattachment.dm
code/modules/mob/living/carbon/human/human_defense.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/organs/organ.dm
code/modules/organs/organ_external.dm
code/setup.dm
2015-12-08 08:09:37 +01:00
BlueNexus
908ae91a08
Can no longer enter mechs while buckled
2015-12-07 11:17:12 +00:00
Jon
c9b7a8ece3
Updates all get_base_turf usages to get_base_turf_by_area.
...
This means that instead of the base turf being defined by the z-level, it's now defined by area and defaulted by z-level.
Updates all "shuttle" and "solar" areas to have a base_turf of space.
Updates docking arms 1, 2, and 3 on the main asteroid level to have a base_turf of space.
Other z-levels may still need updating.
This change means that all actions which destroy or dismantle a tile - for example bombs, a singularity, a shuttle leaving, or deconstruction - now leave these new areas as space not asteroid. Future mapping efforts may need to take this into account.
Conflicts:
code/game/area/Space Station 13 areas.dm
2015-12-06 14:01:21 -05:00
mwerezak
fa6c8415ea
Adds click cooldowns to common healing and repair actions
2015-12-06 00:23:49 -05:00
Zuhayr
81a3cfdcb1
Merge pull request #10172 from LightningIron/mecha
...
Refactor of some mecha functions
2015-12-02 09:55:19 +10:30
LightningIron
ed17e487ca
Adds indents to make a spawn() work properly.
2015-11-27 17:21:07 -06:00
HarpyEagle
38775120d7
Updates mechfab
...
Robolimb manufacturers are now handled specifically instead of assuming all
items follow the same constructor parameter rules.
2015-10-08 16:03:32 -04:00
PsiOmegaDelta
11a03abbf7
Makes more external sources of radiation respect rad-protection.
...
More radiation sources now use the apply_effects() proc to increase rad levels, as this proc respects radiation protective gear (such as radiation suits).
Does not affect internal sources, such as food, injections, etc.
2015-09-25 15:02:20 +02:00
LightningIron
46a90b383d
Adjusts armor booster paths in mechfab_designs.dm.
2015-09-13 21:20:37 -05:00
LightningIron
d303a2cb1a
More merge conflict resolution.
2015-09-13 21:12:14 -05:00
Zuhayr
e27eda4c86
Merge pull request #10672 from mwerezak/frag-grenade
...
Adds fragmentation grenades
2015-09-07 14:12:27 +09:30
Zuhayr
0c56bdd448
Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs
...
Makes it possible to define multiple tag pairs for the Travis check.
2015-09-07 13:57:09 +09:30
PsiOmega
1b23f794c5
Merge remote-tracking branch 'upstream/dev' into 150822-Intercoms
2015-09-02 10:54:04 +02:00
PsiOmega
e1aa20fda5
Radio changes.
...
Removes the radio free range option.
Instead all users can move within the standard radio frequency range, while authorized users can also select department channels.
2015-08-29 17:12:48 +02:00
Kelenius
1ac8b94427
Fixes a few issues with the mechfab, fixes #10852
2015-08-25 12:28:20 +03:00
Kelenius
dd11a301e4
Merge branch 'dev' into ofMechfabAndPanic
...
Conflicts:
code/game/mecha/mech_fabricator.dm
maps/exodus-1.dmm
2015-08-24 18:16:36 +03:00
LightningIron
f956f84485
Merge conflicts resolved.
2015-08-23 17:48:23 -05:00
PsiOmega
e48fbdd1e6
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/game/machinery/newscaster.dm
code/modules/admin/admin.dm
2015-08-21 20:27:48 +02:00
Zuhayr
edf74e4721
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/modules/admin/topic.dm
2015-08-22 02:30:14 +09:30
PsiOmega
d001489d14
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/modules/admin/topic.dm
2015-08-21 18:59:19 +02:00
Zuhayr
3bfa541612
Adds variables for CentComm, NanoTrasen and the station name.
2015-08-22 02:10:11 +09:30
Kelenius
6ba41bbc2a
Merge branch 'dev' into ofMechfabAndPanic
...
Conflicts:
code/__defines/research.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/mecha_parts.dm
code/modules/research/designs.dm
maps/exodus-1.dmm
2015-08-21 16:59:57 +03:00
Kelenius
bed03443d1
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/ZAS/Airflow.dm
code/__defines/items_clothing.dm
2015-08-21 16:15:07 +03:00
PsiOmegaDelta
a0a09c04e4
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
2015-08-20 14:09:07 +02:00
mwerezak
5603884095
Removes #undefine
2015-08-18 17:20:39 -04:00
PsiOmegaDelta
5fbe0819b7
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/game/machinery/Sleeper.dm
2015-08-17 13:05:58 +02:00
Kelenius
8fcd18157e
Fixes mechfab manufacturers
2015-08-17 10:42:27 +03:00
Kelenius
3b1c5666d5
Merge branch 'dev' into ofMechfabAndPanic
2015-08-17 09:58:23 +03:00
Zuhayr
3b712adb5f
Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.
2015-08-16 17:51:19 -07:00
Zuhayr
23e9c7d4c9
Merge
2015-08-16 17:10:11 -07:00
Zuhayr
1fa93c270d
Various small tweaks for the flooring update.
2015-08-16 06:08:19 -07:00
Kelenius
7c1d9b5614
Mech chargers are now a single machine
...
Can be built and upgraded
Resolves #5215
2015-08-16 06:07:36 -07:00
Zuhayr
c8baafed2a
Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and
...
construction/deconstruction. Major map rework/changes.
2015-08-16 06:05:21 -07:00
mwerezak
77ddae4e26
Structures now take damage properly from projectile clouds
2015-08-15 19:08:45 -04:00
PsiOmegaDelta
77d0bbd643
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/game/gamemodes/changeling/modularchangling.dm
2015-08-13 08:09:28 +02:00
Kelenius
60196df634
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/modules/projectiles/gun.dm
2015-08-13 08:40:31 +03:00
Kelenius
012fb38de2
Finalizes mechfab
2015-08-12 21:46:11 +03:00
mwerezak
cb2a094553
Adds fragmentation grenades
...
Adds a fragmentation grenade item that launches a shower of projectiles
in all directions when detonated.
2015-08-11 02:42:25 -04:00
Kelenius
7562f6f01a
Updates mechfab interface
...
Fixes all bugs I found.
2015-08-10 17:46:03 +03:00
Kelenius
dabcccca6b
Updates mechfab UI
2015-08-09 20:45:39 +03:00
Kelenius
210d8fac22
Updates mechfab to not be terrible, WIP
2015-08-07 18:01:12 +03:00
PsiOmegaDelta
e1aa05be02
Merge remote-tracking branch 'upstream/dev' into 150707-MoreOverlaysFewerStates
...
Conflicts:
code/game/machinery/computer/security.dm
2015-07-28 09:16:34 +02:00
PsiOmegaDelta
0ba7643217
Updates files as necessary to adhere to the new standard.
2015-07-27 09:32:51 +02:00
PsiOmega
bd6ec4a98e
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/atoms.dm
code/game/machinery/rechargestation.dm
2015-07-26 10:21:36 +02:00
PsiOmega
659b07415d
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/machinery/rechargestation.dm
code/game/mecha/equipment/tools/medical_tools.dm
maps/exodus-1.dmm
2015-07-26 10:00:12 +02:00
mwerezak
8b81dadfc5
More cleanup
...
Removes dynamic member lookup in rechargestation.dm. Removes unused proc allow_drop().
2015-07-23 01:56:39 -04:00
PsiOmegaDelta
0a3a15ba25
The mecha console now uses the new overlay system.
2015-07-17 08:20:44 +02:00
LightningIron
a9e03e1b94
Adds check to avoid potential runtimes and removes useless redefinition of check_equipment on armor boosters.
2015-07-16 20:46:14 -05:00
