33 Commits

Author	SHA1	Message	Date
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
Alberyk	908fc933f9	Fixing more error and the return of banhammer (#10)	2016-11-18 23:03:56 +02:00
skull132	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
Alberyk	3bd843f4fd	Coin runtime fix and random maint tweaks (#1137) ... fixing a random coin runtime tweaking some of the random maint loot	2016-11-08 00:18:07 +02:00
Alberyk	dae995ba04	Random items fix and small touches (#1115) ... fixing a runtime with random maint loot some additions I left out of heist in my previous prs	2016-11-04 23:58:37 +02:00
Alberyk	e683fbe325	Chief engineer's hardsuit upgrade and more missing map things (#1096)	2016-11-02 21:18:31 +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
Alberyk	68c34b4a99	Dragunov button fix and new wishgranter (#1069) ... -fixing the missing dragunov button -adding the final version of the new wishgranter, with new sprites, lights and etc.	2016-10-27 20:27:11 +03:00
Alberyk	479666a47d	Random maint loot and miscellaneous things (#1052) ... Things done: Created several random objects, that can be used to randomize loot in the maint or other places. Several items, some rare things and other random useful or not objects. Added a svd gun with its own snowflakness, to replace the heister's lwap, but, they will get an extra energy gun to compesate. Added tracksuits, stunrod, new sprite for the rapier, a new sword flavor and the old cane sword. Changed the heister ship armory; two random melee weapons, the dragunov with an extra mag and a random energy gun. Changed the chances of ghetto guns going bad. Replaced the carbines in the ert area with energy pistols, so, they can make use of the holsters. Clumsy people may have trouble with glowsticks now.	2016-10-26 20:29:38 +03:00
NanakoAC	b5e554812b	Cargo Warehouse Stock (#1045) ... This PR is intended to make working in cargo more interesting, and more like a real warehouse experience. IE, the place is an aladdin's cave full of wierd knicknaks and useful oddifies.	2016-10-26 18:56:35 +03:00
Alberyk	080bf5c1cb	Returning the old laser rifles, energy pistols, carbines and much more (#860) ... In this update: Returning old e-rifles from old code. Changing regular energy gun to energy carbine Adding back the energy pistol Buffing a bit the heavy asset protection suit, and fixing more loadout related issues with the nt and syndicate assault teams Reworked a bit the syndicate commando and deathsquad loadouts Returning shotgun boxes, that works like speed loaders, from old code, now with unique sprites Stun batons now emit light	2016-09-07 10:11:48 +02:00
PsiOmegaDelta	a4545f8ded	Scheduler, observation, and New() tweaks. ... Corrects a number of places where New() did not call ..(), and implements similar changes to attempt to ensure New()/initialize() complete running before qdel() runs. Cuts down on the number of created items during server start.	2015-12-27 17:44:53 +01:00
Zuhayr	8ce787ef68	Final tweaks to recipe availability and material inheritance.	2015-05-17 18:22:21 +09:30
Zuhayr	a32179a062	Renamed knives.	2015-05-16 20:54:34 +09:30
Zuhayr	4cf296a6c9	First pass on custom item cleanup/refactor.	2015-05-12 10:53:16 +09:30
PsiOmega	1ae0ad6d92	Updates the atom_pool, now datum_pool, to handle any datum object. ... Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.	2015-04-24 09:59:05 +02:00
mwerezak	b9d2517d83	Tweaks random gun spawners and supply packs ... laser carbines and laser pistols spawn in the armoury with equal probability. Stunshells are now rare like they should be. Shotgun crates now have two combat shotguns, as they are less likely to spawn in the armoury anyways. Weapons crate comes with laser pistols, energy weapons crate comes with laser carbines. Seemed more consistent that way.	2015-03-09 15:47:25 -04:00
Raptor1628	cf0e526d91	Fixes and adjustments ... Moves a few things around in the armory again, tasers back in lockers, guns in officer access area of the armory. Re-adds the tacknife after it was lost in the hydro merge, gives EMTs access to medical lockers.	2015-03-04 11:18:40 -05:00
MrSnapwalk	f4f54dfed1	Fixes action figures not randomizing properly.	2015-02-25 21:52:36 -06:00
Raptor1628	d4870b80ee	Assorted Fixes ... Rebalances the random armory so there are always energy weapons, projectile weapons, and ion weapons. Ammo no longer random. Fixes some oversights with the EMT area and improves flow. Sec Guns fit in belts. Fixes typos and a missing price in the vending machine.	2015-02-24 14:40:02 -05:00
MrSnapwalk	71f8a5c8e8	Minor fixes, action figure refactor.	2015-02-19 20:37:36 -06:00
MrSnapwalk	cc0266c776	Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into moretoys ... Conflicts: code/game/objects/random/random.dm	2015-02-18 19:02:23 -06:00
Raptor1628	2ae273e1b8	Gear again ... Collection of gear and changes from the four gear polls on the forums includes: 2 new automatic weapons, mapped in to ERT and random weapon spawns. Laser carbine balance. Slow emergency softsuits, no armor value other than bio and rad, 4 slowdown. 1 knife, not mapped in, available for Psi's uplink merge. New vests: 2 types, 2 pocket no slowdown, 4 pocket with slowdown, second is available from cargo and one random vest spawn in armory. The first replaces all instances of the old vests. Old vests still exist in code. Mercenary vest with no slowdown, 4 pockets, and slightly better armor, not on map, possibly for Nukes or Traitor Uplink Holster rearrangement for custom loadout. Acid dispenser, mapped into robotics and science. New food items, added to vendors and rations crate. New random medical spawns, added to medbay. Cargo and loadout additions to accommodate new items. 1 beanbag loaded 5 round shotgun added to Warden's closet to compensate for officers having .45 ltls and the HoS having an e-gun, suggested by IRC and server. http://baystation12.net/forums/viewtopic.php?f=5&t=12064 http://baystation12.net/forums/viewtopic.php?f=5&t=12031 http://baystation12.net/forums/viewtopic.php?f=5&t=12027 http://baystation12.net/forums/viewtopic.php?f=5&t=12007	2015-02-18 15:35:37 -05:00
MrSnapwalk	52072bc7cf	Adds action figures, large and small plushies, and the toy cult sword. Adds all new toys to the arcade machine.	2015-02-17 20:38:13 -06:00
Skully71	3d2abddaa7	Add random single object to enable a given object to be spawned at chance	2015-02-04 10:41:47 +01:00
Amunak	4882074739	Code formatting, EOL at EOF fixes, refactoring	2014-12-18 03:11:49 +01:00
Amunak	edffbc680d	Fixed capitalization of most game items	2014-12-18 03:10:36 +01:00
mwerezak	d506eca89a	Adds tape rolls to the tool storage spawner list	2014-12-08 00:15:27 -05:00
Kelenius	a1348faa8c	Cables are now stacks	2014-08-25 18:54:35 +04:00
Jarcolr	522bebb197	Fixes #4721 ... Also added the multitool to bomb supply storage.	2014-04-12 13:06:10 +03:00
jack-fractal	e3fd232741	- removing yellow and black gloves from the randomized tech storage object ... - adding toolbelts - rebuilding changes to map	2013-06-11 00:52:32 -04:00
jack-fractal	23498c269a	- adding random objects ... - randomizing main tool storage starting objects - randomizing secondary tool storage starting objects	2013-06-09 18:12:57 -04:00