Werner
5df9509435
Computer tweaks ( #1285 )
...
Pulling in some computer changes from bay.
2016-12-25 14:19:50 +02:00
NanakoAC
6cef8c9074
Attack Proc fixes ( #1259 )
...
Baymerge changed the attack proc, i think by removing a default value, and a lot of things broke because they weren't using the function correctly.
This proc does three main things.
Adds a default to /obj/item/proc/attack to target the chest when no target zone is supplied.
Fixes the lack of a target zone in many attack procs, properly defining it so it'll get passed to the parent, and ensure that bodypart-specific targeting works.
Removes most instances of code to retrieve the user's selected zone, and instead to use the zone passed into the attack function. saves duplication of effort.
2016-12-24 03:34:23 +02:00
LordFowl
51bd200d7c
Porting Apollo Infractions Computer ( #1033 )
...
Ports Apollo's infraction's system, creating a permanent criminal record for every character. Every minor or medium infraction accrued over the course of a round is added to the character's permanent security record which is available at vanilla records councils. Antagonists are automatically exempt from this process, and players can exercise control over what charges they consider canon or not.
Brigging a person is now dependent on the criminal sentencing computer, which reads a person's ID and applies a brig timer automatically for the charges selected. Personnel without ID's will have to be brigged manually.
2016-12-23 01:00:04 +02:00
SoundScopes
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
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
inselc
da2f74a9ff
Bugfixes: Fax machines, CentCom turrets, Robo-limb emag. New feature for monkey cubes ( #1116 )
...
Fixes #1059 , #131
Resolves #1020
Fixes #1100
Resolves #663
2016-11-06 20:34:29 +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
87e041aa75
Merge remote-tracking branch 'bay12-upstream/master' into development
2016-10-07 00:58:39 +03:00
skull132
759c463a2c
BOREALIS 2 Implementation ( #938 )
...
Removes BOREALIS I.
Implements HTTP POST requests, credit to Oisin100 from Yogstation13 for the ByondPOST.dll.
Implements the BOREALIS II datum and converts all calls to reroute to that.
Adds round logging to channel_announce channels.
2016-09-18 23:28:01 +03:00
NanakoAC
a5478a5360
Animal Tweaks: Second attempt ( #849 )
...
* Merge branch 'AnimalTweaks_Fix4' into AnimalTweaks_Fix5
# Conflicts:
# code/modules/mob/living/living.dm
* REMOVED VENT THINGS FROM CHANGELOG
* switch statement for helper
2016-09-12 07:06:40 +01:00
Werner
fb25382405
Rewrite API ( #825 )
...
he /world/Topic() API has been rewritten.
General function:
The API is initialized upon roundstart and generates a list of possible api requests from /code/datums/api.dm
Once a request is made the following checks are performed:
If a query parameter is set (the function that should be called)
If the ip is ratelimited (or rate-limit-whitelisted)
The query is authenticated against the db using ip, function and key
If these checks pass, it is validated that the api command exists
Then the api command is called, all supplied params are passed through
Each API function returns 1 no matter if it failed or succeded
Additional info is provided in the statuscode, response and data vars
The statuscode, response and data are send back to the caller (through list2params)
The data var is json encoded before sending it back
This is not backward compatible to the current API
Current API Clients need to be updated
2016-09-04 21:41:44 +02:00
NanakoAC
e240def2bf
Contained Sprites v2 ( #758 )
...
Overhauls the contained sprites system to be feature complete in terms of what it can do and offers. Now almost all cases of clothing and other items may use the system properly.
2016-08-25 16:55:42 +02:00
NanakoAC
b6eee04dac
Welding Tool tweaks ( #517 )
...
Welding tools can now be used to burn paper
The upgraded and experimental welding tools will now fit in a toolbelt. Upgraded renamed to advanced.
Fixed and implemented the Experimental Welding Tool, which has a regenerating fuel supply. Can be produced in R&D, requires 4 research in engineering and materials.
2016-07-05 22:59:21 +03:00
skull132
740c0efb0b
Fax Alerts ( #445 )
...
Makes fax machines and request consoles ping a set of linked PDAs upon the receipt of a message. You can link your PDA with any of these machines through the UI.
2016-06-24 14:51:51 +03:00
skull132
17938853d5
Of Helper Procs & Dumbs
...
Makes a mob/proc/can_use_hand(), which determines whether or not a mob can use a given hand.
Redefined in human.dm to check a hand's status and usability.
2016-03-25 20:33:10 +02:00
skull132
6c158fc4e2
Fixes #149
...
Sanity checks forever.
2016-02-21 15:22:11 +02:00
skull132
0085f79e44
Faxes onto Discord
2016-02-16 17:42:16 +02:00
skull132
71e475cac9
+CCIAA bugs
...
Fixes the following:
* CCIA Agent access on CC
* CCIAAs can now see faxes
* Sent faxes are saved properly
* "Send New Fax" hyperlink works, from the check-fax-history menu
2016-02-10 00:54:15 +02:00
skull132
26a449b861
Merge remote-tracking branch 'Aurorastation/development'
...
# Conflicts:
# code/modules/admin/admin_verbs.dm
2016-02-06 02:08:11 +02:00
skull132
c302fcf210
Merge pull request #60 from Ryan784/DEV-Flags
...
DEV+ Flags and verbs
2016-02-06 01:09:48 +02:00
skull132
1f7f3b1751
CCIAA - Send_admin_fax() -> create_admin_fax() & Fixes
...
The proc create_admin_fax() now works fully, under all scenarios tested.
2016-02-05 18:24:55 +02:00
Mahzel
d850304ffe
Update #54 - Form database
...
Form database implementation.
Paper bundles update.
2016-02-05 15:08:12 +01:00
Ccomp5950
bd60099a7e
Removes unused pressure_resistance variable.
...
This is used with FEA not ZAS
Though it's kind of funny to look at what some of these values were set at.
(For reference: ONE_ATMOSPHERE = 101.325)
2016-02-03 18:17:52 -05:00
skull132
8569d1c1ab
+CCIAA Flag
2016-02-02 23:37:15 +02:00
PsiOmegaDelta
1a8fc50f1e
Removes suicide code.
2015-12-14 15:57:56 +01:00
GinjaNinja32
1921c35231
fix issues with indented absolute path definitions
2015-12-09 14:12:54 +00: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
050c1f631a
Added a missing update_icon()
2015-12-07 11:27:33 +00:00
Karolis2011
2ecf44a665
Removed uneceserry variable
2015-11-22 13:23:45 +02:00
Karolis2011
df110f28a5
Fixes AI camera not working and moves can_capture_turf to the mob.
2015-10-10 18:43:26 +03:00
Karolis2011
414c160b9f
Removed code copy paste and fixed light not showing up on images.
2015-10-10 02:58:50 +03:00
Kelenius
83adba88d4
Updates blob
...
Remains of player blob axed.
blob_act() axed. Blob now has an arbitary set of things it can attack.
It will flow over everything else. Blob has an awful tendency to destroy
non-craftables.
Will test more tomorrow.
Blob will now attack mechs.
Fixes #8106 .
Fixes #10705 .
2015-10-05 18:10:16 +03:00
PsiOmega
63de1764c3
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-09-27 13:48:33 +02:00
PsiOmega
807e7bf954
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/human/life.dm
code/modules/spells/artifacts.dm
2015-09-27 13:36:56 +02:00
HarpyEagle
592c824837
Changes paper and paper bundle gender, plus rename
2015-09-26 20:27:57 -05: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
Raptor1628
a7ff1a09ee
Adds Supply Fax
...
Quartermaster now has fax access and a fax machine. Fax machines have a
third admin channel, "Supply" for special requests like three thousand
mankinis or a Phazon, up to the admins to accept or deny requests, and
deduct cargo points if they'd like to.
2015-08-31 15:32:35 -04:00
PsiOmega
35ea424edc
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
...
Conflicts:
code/modules/clothing/spacesuits/rig/rig.dm
2015-08-29 10:06:18 +02:00
Zuhayr
23564bda0c
Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess
...
Synths now relies on access permissions as well.
2015-08-24 17:45:10 +09:30
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
Zuhayr
545e465dfc
Added paper shredders from Minijar.
2015-08-22 02:00:08 +09:30
PsiOmegaDelta
1e7251ded4
Id card handling changes.
...
Equipment now first checks if an id card may be removed, rather than always forcefully doing so.
Station synthetics now have a custom id, rather than re-using the captain's spare, as utilizing robotic storage would otherwise make their id cards available for public use.
2015-08-21 14:04:06 +02:00
PsiOmegaDelta
a0a09c04e4
Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs
2015-08-20 14:09:07 +02:00
Zuhayr
e3d9bc90e3
Added more colour defines, added functionality to the floor painter.
2015-08-18 13:41:04 -07: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
Chinsky
3b500d4076
Merge pull request #10279 from Kearel/LibraryModifications
...
Library modifications
2015-08-13 17:47:16 +03:00
