5df9509435
Computer tweaks ( #1285 )
...
Pulling in some computer changes from bay.
2016-12-25 14:19:50 +02:00
7724f096fa
Misc things - Related to merge ( #1280 )
...
Redefine span() to be a macro. Because we don't need it to be a proc ever again.
Rebuild the .all_changelog.yml file to have Bayport stuff at the bottom (onto which we'll add our own shit from this cycle).
Rebuilt the .html file for changelogs to correspond to the above change.
Modified download programs to actually use seconds.
2016-12-25 01:01:20 +02:00
b247ba78a4
Adding socks ( #1284 )
...
The long waited sock update;
Socks are being added as another underwear like option, with some exclusive ones for females. Only humans (and squish) can have them atm.
Also, I am nearly sure this will work.
2016-12-24 04:28:43 +02:00
9b094ad0eb
Merge branch 'upstream/development' into development
...
# Conflicts:
# code/_helpers/time.dm
# code/game/objects/items/devices/floor_painter.dm
# code/game/objects/items/stacks/medical.dm
# code/global.dm
# code/modules/cargo/randomstock.dm
# code/modules/mob/living/carbon/human/human_defense.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/mob_movement.dm
# code/modules/paperwork/faxmachine.dm
2016-12-18 01:06:45 +02:00
a20576ce1d
Dview fixes ( #19 )
...
Centralises the dview code and defines in one file
Removes the proc version of dview, as it was unused
Fixes three compile errors with offset lighting code
2016-11-21 12:57:34 +02:00
3e92d63ddf
Fixing compile errors ( #9 )
2016-11-18 18:03:27 +02:00
ee68f3c9d0
Final merge
...
Merge branch 'development-2' into development
# Conflicts:
# baystation12.dme
# code/_helpers/icons.dm
# code/controllers/master_controller.dm
# code/game/machinery/Sleeper.dm
# code/game/machinery/computer3/laptop.dm
# code/game/machinery/doors/door.dm
# code/game/machinery/floorlayer.dm
# code/game/machinery/vending.dm
# code/game/mecha/mech_fabricator.dm
# code/game/objects/effects/decals/contraband.dm
# code/game/objects/explosion.dm
# code/game/objects/items/robot/robot_upgrades.dm
# code/game/objects/items/weapons/melee/misc.dm
# code/game/objects/items/weapons/storage/boxes.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/game/objects/structures/window.dm
# code/modules/clothing/spacesuits/rig/rig.dm
# code/modules/clothing/suits/jobs.dm
# code/modules/mob/freelook/update_triggers.dm
# code/modules/mob/living/carbon/human/human_defense.dm
# code/modules/mob/living/carbon/human/human_movement.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/species.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/living_defines.dm
# code/modules/mob/mob_helpers.dm
# code/modules/mob/mob_movement.dm
# code/modules/projectiles/ammunition/boxes.dm
# nano/templates/sleeper.tmpl
2016-11-12 00:10:21 +02:00
e9b688e1f6
Merge branch 'development-2' into development
...
Christ on a stick. SO MANY ERRORS. REEE.
# Conflicts:
# baystation12.dme
# code/_helpers/lists.dm
# code/_helpers/logging.dm
# code/_helpers/text.dm
# code/_onclick/click.dm
# code/controllers/configuration.dm
# code/controllers/master_controller.dm
# code/datums/supplypacks.dm
# code/game/antagonist/antagonist.dm
# code/game/antagonist/antagonist_print.dm
# code/game/antagonist/outsider/commando.dm
# code/game/antagonist/outsider/ninja.dm
# code/game/area/areas.dm
# code/game/gamemodes/cult/cult_items.dm
# code/game/gamemodes/game_mode.dm
# code/game/jobs/access.dm
# code/game/machinery/atmoalter/canister.dm
# code/game/machinery/autolathe.dm
# code/game/machinery/doors/airlock.dm
# code/game/machinery/recharger.dm
# code/game/machinery/suit_storage_unit.dm
# code/game/mecha/mech_fabricator.dm
# code/game/mecha/mecha.dm
# code/game/objects/effects/spiders.dm
# code/game/objects/items.dm
# code/game/objects/items/devices/PDA/PDA.dm
# code/game/objects/items/devices/flash.dm
# code/game/objects/items/devices/lightreplacer.dm
# code/game/objects/items/devices/paicard.dm
# code/game/objects/items/devices/scanners.dm
# code/game/objects/items/devices/suit_cooling.dm
# code/game/objects/items/devices/uplink.dm
# code/game/objects/items/robot/robot_upgrades.dm
# code/game/objects/items/toys.dm
# code/game/objects/items/weapons/cards_ids.dm
# code/game/objects/items/weapons/handcuffs.dm
# code/game/objects/items/weapons/manuals.dm
# code/game/objects/items/weapons/material/kitchen.dm
# code/game/objects/items/weapons/material/misc.dm
# code/game/objects/items/weapons/material/swords.dm
# code/game/objects/items/weapons/melee/energy.dm
# code/game/objects/items/weapons/melee/misc.dm
# code/game/objects/items/weapons/scrolls.dm
# code/game/objects/items/weapons/storage/belt.dm
# code/game/objects/items/weapons/stunbaton.dm
# code/game/objects/items/weapons/tools.dm
# code/game/objects/objs.dm
# code/game/objects/structures/crates_lockers/closets.dm
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/game/objects/structures/janicart.dm
# code/game/sound.dm
# code/game/turfs/simulated.dm
# code/game/verbs/ooc.dm
# code/global.dm
# code/modules/admin/verbs/debug.dm
# code/modules/admin/verbs/modifyvariables.dm
# code/modules/client/client procs.dm
# code/modules/client/preferences.dm
# code/modules/clothing/clothing.dm
# code/modules/clothing/head/hardhat.dm
# code/modules/clothing/head/helmet.dm
# code/modules/clothing/head/jobs.dm
# code/modules/clothing/head/misc_special.dm
# code/modules/clothing/shoes/jobs.dm
# code/modules/clothing/spacesuits/alien.dm
# code/modules/clothing/spacesuits/captain.dm
# code/modules/clothing/spacesuits/miscellaneous.dm
# code/modules/clothing/spacesuits/rig/rig_pieces.dm
# code/modules/clothing/spacesuits/rig/suits/alien.dm
# code/modules/clothing/spacesuits/spacesuits.dm
# code/modules/clothing/spacesuits/void/merc.dm
# code/modules/clothing/spacesuits/void/void.dm
# code/modules/clothing/suits/armor.dm
# code/modules/clothing/suits/jobs.dm
# code/modules/clothing/suits/storage.dm
# code/modules/clothing/suits/utility.dm
# code/modules/clothing/suits/wiz_robe.dm
# code/modules/clothing/under/jobs/security.dm
# code/modules/economy/Events.dm
# code/modules/economy/Events_Mundane.dm
# code/modules/economy/economy_misc.dm
# code/modules/events/blob.dm
# code/modules/events/event.dm
# code/modules/events/event_container.dm
# code/modules/events/event_manager.dm
# code/modules/events/money_lotto.dm
# code/modules/events/prison_break.dm
# code/modules/events/spacevine.dm
# code/modules/hydroponics/trays/tray.dm
# code/modules/mob/dead/observer/observer.dm
# code/modules/mob/emote.dm
# code/modules/mob/holder.dm
# code/modules/mob/language/station.dm
# code/modules/mob/living/bot/cleanbot.dm
# code/modules/mob/living/carbon/alien/diona/diona.dm
# code/modules/mob/living/carbon/alien/diona/diona_attacks.dm
# code/modules/mob/living/carbon/give.dm
# code/modules/mob/living/carbon/human/emote.dm
# code/modules/mob/living/carbon/human/human.dm
# code/modules/mob/living/carbon/human/human_defense.dm
# code/modules/mob/living/carbon/human/inventory.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/living/carbon/human/species/outsider/vox.dm
# code/modules/mob/living/carbon/human/species/station/golem.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# code/modules/mob/living/carbon/metroid/metroid.dm
# code/modules/mob/living/living.dm
# code/modules/mob/living/living_defense.dm
# code/modules/mob/living/living_defines.dm
# code/modules/mob/living/silicon/ai/ai.dm
# code/modules/mob/living/silicon/pai/admin.dm
# code/modules/mob/living/silicon/pai/pai.dm
# code/modules/mob/living/silicon/robot/drone/drone.dm
# code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
# code/modules/mob/living/silicon/robot/emote.dm
# code/modules/mob/living/silicon/robot/robot_items.dm
# code/modules/mob/living/silicon/robot/robot_modules.dm
# code/modules/mob/living/silicon/silicon.dm
# code/modules/mob/living/simple_animal/bees.dm
# code/modules/mob/living/simple_animal/friendly/cat.dm
# code/modules/mob/living/simple_animal/friendly/corgi.dm
# code/modules/mob/living/simple_animal/friendly/farm_animals.dm
# code/modules/mob/living/simple_animal/friendly/mouse.dm
# code/modules/mob/living/simple_animal/friendly/spiderbot.dm
# code/modules/mob/living/simple_animal/hostile/hostile.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/logout.dm
# code/modules/mob/mob.dm
# code/modules/mob/mob_grab_specials.dm
# code/modules/mob/mob_helpers.dm
# code/modules/mob/new_player/sprite_accessories.dm
# code/modules/organs/organ.dm
# code/modules/organs/organ_alien.dm
# code/modules/organs/organ_external.dm
# code/modules/paperwork/faxmachine.dm
# code/modules/projectiles/ammunition/boxes.dm
# code/modules/projectiles/ammunition/bullets.dm
# code/modules/projectiles/guns/energy/nuclear.dm
# code/modules/projectiles/guns/energy/rifle.dm
# code/modules/projectiles/guns/energy/special.dm
# code/modules/projectiles/guns/projectile.dm
# code/modules/projectiles/guns/projectile/automatic.dm
# code/modules/projectiles/guns/projectile/pistol.dm
# code/modules/projectiles/guns/projectile/revolver.dm
# code/modules/projectiles/guns/projectile/shotgun.dm
# code/modules/projectiles/projectile/bullets.dm
# code/modules/projectiles/projectile/special.dm
# code/modules/reagents/reagent_containers.dm
# code/modules/reagents/reagent_containers/food/drinks.dm
# code/modules/research/designs.dm
# code/modules/research/destructive_analyzer.dm
# code/modules/research/rdconsole.dm
# code/modules/spells/artifacts.dm
# code/modules/spells/spellbook.dm
# code/modules/tables/tables.dm
# code/world.dm
# config/example/config.txt
# icons/mob/items_lefthand.dmi
# icons/mob/items_righthand.dmi
# icons/obj/lighting.dmi
2016-10-31 00:01:52 +02:00
87e041aa75
Merge remote-tracking branch 'bay12-upstream/master' into development
2016-10-07 00:58:39 +03:00
6cf7cbd933
Merge pull request #11988 from PsiOmegaDelta/160115-IAmALittleBitSpecial(InTheHead)
...
Makes special role preferences a list, instead of flag entry.
2016-02-02 15:26:09 -05:00
654f2ccaa0
Makes all special role entries use unique ids now that it is possible.
2016-01-30 17:22:17 +01:00
4ec7639e8f
Converts old projectile code to the new format.
...
Fixes ED-209, hostile mobs, and mechs being unable to fire as it caused runtimes.
Also updates the old turrets by removing them.
2016-01-29 08:28:09 +01:00
774b9dfa8a
listequal as macro instead (kudos to Boop (whom is Secretly Mloc)
2016-01-27 01:55:11 -05:00
f6c1e37d2a
add a little ID to uniquely identify rounds in logs and to players
...
Signed-off-by: Mloc <colmohici@gmail.com >
2016-01-21 21:19:16 +00:00
b74f2baf6d
Makes special role preferences a list, instead of flag entry.
...
Allows us to define more than 16 special roles.
Updates some role usages to use the new ghost trap system.
2016-01-15 11:34:00 +01:00
5524739e70
Tweaks the datum pooling.
2016-01-08 16:03:54 +01:00
875d8455f0
Pooling Update from TG
...
Ports https://github.com/tgstation/-tg-station/pull/13279 .
2016-01-08 14:47:13 +01:00
6633fb4e08
Unit Tests
...
Adds an example, edits Travis to run them.
2015-12-31 11:18:15 -05:00
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
b2720a8c6c
Fixes sparks causing runtimes on pooling.
2015-12-09 20:41:55 +01:00
60e785da97
Merge pull request #11458 from PsiOmegaDelta/151117-MultitoolPower
...
Multitool Upgrade
2015-12-09 21:34:12 +03:00
1921c35231
fix issues with indented absolute path definitions
2015-12-09 14:12:54 +00:00
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
edb50b3504
Allows you to define a base turf for an area which overrides the z-level's base turf in unsorted.dm.
...
It will first check to see if the turf is set, and if not it will still use the z-level default.
This means we can mark areas as having a base of space to override the z-level base of asteroid that we're using.
As a result, we can ensure the bombs, shuttles moving, etc. leave behind an space turf by defining shuttles, solars/"external" areas as using space as a base.
Areas will need to be updated to check with base_turf = /turf/space and references to the old get_base_turf proc updated so all calls (bombs, Nar'Sie, deconstruction, etc.) have the correct effect, but it's tired and I want to commit this now so I'm committed to finishing it tomorrow.
2015-12-06 13:18:46 -05:00
c30a518221
Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
...
Conflicts:
code/modules/mob/living/silicon/ai/ai.dm
2015-12-02 09:18:07 +01:00
eb3a266444
Merge pull request #11507 from Zuhayr/dev
...
Adds a possession system for ghost mousedrop(). Currently allows for control of mice, drones and use of drone fabricators.
2015-11-30 16:55:14 +01:00
4e89045aab
Merge pull request #11451 from Loganbacca/wireless
...
Wireless controller for machinery connections
2015-11-27 07:59:59 +01:00
3a14650dc1
Wireless controller cleanup
...
Changed back to count based spawn_sync failsafe
Moved toggle buttons to be a subtype
Purged unfinished wireless tool (code and icon)
2015-11-25 21:14:38 +13:00
d7602a2cd5
Wireless and spawn_sync tweaks
...
Modified spawn_sync to include the spawning code, thus simplifying it's usage.
Modified spawn_sync to use actual time for failsafes.
A couple of sensibility tweaks for the wireless controller.
Cleaned up devices.dm to use new spawn_sync code.
Suggestions courtesy of @mwerezak
Added a changelog
2015-11-24 23:00:58 +13:00
98c8729bb3
Merge pull request #11265 from Karolis2011/camera_fix
...
General camera fixes.
2015-11-23 09:29:02 +00:00
da7a4a78d8
Documentation and stuff
...
Documentation, documentation, documentation.
Safety checks.
Reshuffled some code.
Modified wifi senders and receivers to both use var/id, instead of two different vars for basically the same purpose.
2015-11-23 21:46:29 +13:00
50fb4a8de7
Merge remote-tracking branch 'upstream/dev' into 151117-MultitoolPower
...
Conflicts:
code/game/objects/items/devices/multitool.dm
2015-11-23 08:57:12 +01:00
e5ec6c761b
Adds a possession system for ghost mousedrop(). Currently allows for control of mice, drones and use of drone fabricators.
2015-11-23 05:52:33 +10:30
e7ec675bef
Spawn sync helper
...
See spawn_sync.dm for documentations
2015-11-22 22:32:52 +13:00
821987c31b
Pipe photo fix
2015-11-22 16:40:53 +13:00
6b742bd44f
Add /tg/-style attack animations
...
Thanks to @GinjaNinja32 for some style tweaks
2015-11-20 15:45:16 -05:00
a287e47c28
Merge pull request #11364 from PsiOmegaDelta/151024-Btime
...
Scheduler now uses btime, and other improvements.
2015-11-19 10:14:03 +03:00
47ece50813
Allows the AI to utilize its multitool where applicable.
2015-11-18 11:01:08 +01:00
e40246e9df
Character setup tweaks.
...
Adds client verb to access the character setup screen from anywhere.
Moves name validation to species level, making it possible for IPCs to have numbers in their name.
Adds gender validation, also adds support to add neuter/plural genders in the future if ever desired.
Now sanitizes preferences before applying them to a mob.
Fixes #11433 .
2015-11-11 13:50:22 +01:00
9d6c99aaf3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/modules/mob/living/carbon/breathe.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
html/changelogs/.all_changelog.yml
2015-10-27 13:08:33 +01:00
3db2c4fb49
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
2015-10-27 12:38:28 +01:00
88d85c16fa
Scheduler now uses btime.
...
Partial port of https://github.com/ParadiseSS13/Paradise/pull/1540 .
2015-10-24 12:53:04 +02:00
299ad9580c
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/admin/admin.dm
code/modules/admin/topic.dm
2015-10-16 13:02:59 +02:00
fc4c1d6af7
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/storage/boxes.dm
code/game/objects/items/weapons/storage/storage.dm
2015-10-16 11:04:43 +02:00
3b5990121f
Blobs locations are now more random.
...
Blobs now randomly pick a random turf without obstructions in maintenance, instead of from a pre-determined list of locations.
Blobs also now log their spawn location, which admins can use to jump to it.
Space vines and nuclear discs have been updated to use the same mechanics.
2015-10-13 18:49:55 +02:00
df110f28a5
Fixes AI camera not working and moves can_capture_turf to the mob.
2015-10-10 18:43:26 +03:00
83158d3d16
More tolarable 3 way manifold rendering fix.
2015-10-10 16:58:01 +03:00
414c160b9f
Removed code copy paste and fixed light not showing up on images.
2015-10-10 02:58:50 +03:00
aaba2c5c8c
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/silicon/robot/robot_modules.dm
2015-10-07 08:14:30 +02:00
c5d8fbfd57
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/antagonist/alien/borer.dm
code/modules/mob/living/living_defense.dm
2015-10-07 08:07:23 +02:00
Werner