NanakoAC and skull132
d19c62c081
Cargo. Event, Holder fixes ( #1253 )
...
Fixes runtime errors with cargo stock. Was caused by the type of armor boosts changing.
Probably fixes the issue of mobs dying when picked up. I added some robustness and safeties to it
Tweaks event probabilities, adjusting the major event distribution (rarer bears), raising some others and slightly reducing the overall chance of major events.
2016-12-21 21:39:22 +02:00
SoundScopes and skull132
97bb1e8e38
Travis: Indentation / list fixes ( #1254 )
...
Fixes the tools/indentation.awk script to not demand a comma at the end of perfectly valid comments.
Makes it report unnecessary commas in lists.
Readds it to the Travis build list.
2016-12-19 16:40:52 +02:00
skull132
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
skull132 and GitHub
c749c18b93
Better Runtime Logging ( #913 )
...
Introduces a few updates from /tg/station13 with regards to runtime logging, and then modifies the runtime logging code to work properly. Developers now have access to both condensed and uncondensed runtime logs, with the former being updated at the end of each round.
2016-09-12 21:19:45 +03:00
PsiOmegaDelta
25f5c132d6
The created logfile is now pushed to the same branch that the relevant PR targeted.
2016-01-27 20:48:54 +01:00
PsiOmegaDelta
73de01792c
Adds GitHub webhook source.
2016-01-25 14:20:06 +01:00
PsiOmegaDelta
2593f1190c
Merge pull request #11722 from Baystation12/dev-freeze
...
Dev
2015-12-21 09:44:06 +01:00
PsiOmegaDelta
e56810e735
Merge pull request #11721 from Baystation12/master
...
Dev-freeze
2015-12-21 09:37:02 +01:00
PsiOmegaDelta
8b3724e3e3
Ports Kun-Peng's general map merge scripts.
...
These backups all *.dmm files in the maps folder, rather than those with specific names.
2015-12-19 22:01:38 +01:00
GinjaNinja32
67c53ddd1d
Travis now checks incorrect indentation of absolute paths
2015-12-09 13:52:22 +00:00
GinjaNinja32
18851cd214
Merge pull request #11591 from BlueNexus/patch-2
...
ChangelogGenerator Refactor for PEP8
2015-12-05 05:58:55 +00:00
BlueNexus
0ca887d473
DMITool PEP8
...
Please. Write. Proper. Python.
2015-12-04 11:42:48 +00:00
BlueNexus
fbb6179017
ChangelogGenerator Refactor for PEP8
...
Whyy
2015-12-04 11:29:33 +00:00
PsiOmegaDelta
bd3b4c5d81
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-19 21:37:05 +02:00
PsiOmegaDelta
de9e68cdcd
Merge pull request #11151 from Baystation12/master
...
Dev-freeze
2015-09-19 21:25:15 +02:00
PsiOmegaDelta
924359d858
Backports map merge fix.
2015-09-19 09:30:08 +02:00
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
Atlantis
c246dece15
Fixes Mapmerge
...
- Changes mapmerge in a way GinjaNinja32 recommended in PR #10899
2015-09-01 03:00:58 +02: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
PsiOmegaDelta
03578d4ea3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-08-06 08:12:38 +02:00
GinjaNinja32
76656a0cf1
Recompile dmitool.jar under Java 7 instead of Java 8
2015-08-05 21:39:59 +01:00
PsiOmegaDelta
688b8b52f7
Makes it possible to define multiple tag pairs to check for.
2015-07-27 09:32:25 +02:00
PsiOmegaDelta
772488fadc
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/setup.dm
maps/exodus-1.dmm
maps/exodus-5.dmm
2015-06-17 09:33:34 +02:00
PsiOmegaDelta
641df4a530
Use of invalid prefixes in changelogs no longer silently fail in Travis.
2015-06-16 11:25:56 +02:00
PsiOmegaDelta
06a1ece4b8
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/ZAS/Controller.dm
code/datums/mind.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/living/silicon/pai/pai.dm
2015-06-16 10:52:33 +02:00
PsiOmega
90c71d00f1
Travis span matcher script
...
A slightly overkill script to ensure each file contains as many opening span tags as closing.
Almost implemented to allow checking multiple pairs of tags.
2015-06-14 17:37:35 +02:00
mwerezak
0527e4b05f
Adds dmitool import iconstate splicing
...
Adds the ability to splice in specific directions and/or frames when
importing icon states with dmitool.
2015-06-13 12:19:42 -04:00
mwerezak
1cbfff09d7
Adds python wrapper for dmitool
2015-06-12 00:06:58 -04:00
mwerezak
c38d88c06a
Updates dmitool to be able to insert specific directions
...
Adds a direction option to the import command, that causes the imported
icon state is overwrites the specified direction, if nodup is set.
Otherwise, the direction is overwritten on a copy.
2015-06-12 00:01:41 -04:00
PsiOmega
864d18caff
Updates the list of valid log prefixes.
2015-06-01 10:12:24 +02:00
PsiOmega
c46578c810
AddToChangelog removal.
...
Removes the source for the old changelog tool.
2015-05-25 20:35:08 +02:00
PsiOmega
a1ff266981
Updates the event probability sheet with the new events.
2015-05-10 10:58:46 +02:00
PsiOmega
3edfbf0040
Moves us to the changelog system used by /vg/, /tg/, and others.
...
Cleans up the HTLM folder, removing unused files.
Will also attempt include /tg/'s "You have unread changelog entries" notification on join.
2015-04-18 13:00:28 +02:00
PsiOmega
93ac826f02
Adds more events, misc event changes.
...
Only two more this time:
Random space dust attack.
Random gravity failure.
Moves space vines from moderate to major events, due to its now more dangerous nature.
Removes now irrelevant alien/ninja customized event handlers.
Adds Excel sheet for aiding in event probability calculations.
2015-03-31 13:07:27 +02:00
Chinsky
3ddd0b480f
Merge pull request #8061 from Baystation12/master
...
master -> wiz
2015-02-06 10:41:12 +03:00
GinjaNinja32
f4435503cc
Linux versions of PsiOmegaDelta's git_merge_installer scripts
2015-02-04 10:12:11 +00:00
PsiOmega
0673c9179b
Git Merge Installers
...
There are now two basic bat scripts in dmitool and mapmerge which painlessly inserts the necessary lines for the commit tools to work into .git/config.
2015-02-03 22:02:50 +01:00
GinjaNinja32
aeff099189
Fixes compiled jar being compiled under Java 8
2015-02-03 14:50:39 +00:00
Zuhayr
704d668b18
Merge pull request #7732 from GinjaNinja32/dmitool
...
[dmitool] Add importing PNG files as icon_states
2015-01-09 06:41:38 +10:30
=
cb11a95aa7
Fix clean_map_git.sh
2015-01-07 20:22:55 +00:00
=
73da1156a2
Various improvements; options, version, info
...
Adds options to PNG importing so that any valid DMI file can be entirely built from PNG files and DMITool.
Adds version string and "version" command
Adds info command to get a list of states easily (the only way previously was to print the descriptor with "dmitool -vvvv verify $file" and parse with e.g. grep/sed)
2015-01-07 17:26:21 +00:00
GinjaNinja32
c49f0f2f89
Add importing PNG files as icon_states
2014-12-02 23:32:05 +00:00
GinjaNinja32
b7032cafca
Update help text, guard against illegal values
2014-11-30 20:15:43 +00:00
GinjaNinja32
9018892947
Update DMI state extraction
2014-11-30 20:05:10 +00:00
PsiOmegaDelta
6adc68bbd1
Merge pull request #7145 from GinjaNinja32/dmitool
...
DMI tool thingy. Is able to do many things with DMI files.
2014-11-29 09:48:47 +01:00
GinjaNinja32
627626c49d
Automatic DMI merge stuff
2014-11-26 21:28:40 +00:00
GinjaNinja32
a17cb4c7d2
Slightly more sensible defaults for diff output with +q
2014-11-26 20:58:30 +00:00
GinjaNinja32
d9a6b5ad11
DMI tool initial commit
2014-11-26 20:32:24 +00:00
PsiOmega
e4127843a6
Z-level split.
...
Splits each individual Z-level into its own map file.
2014-11-24 12:40:12 +01:00
Whitellama
f3091cb215
Updated changelog
2014-07-26 17:52:16 -07:00
