Commit Graph

561 Commits

Author SHA1 Message Date
Alberyk
d2b49ab1cb Hoodies and sec gear fixes (#1272)
Changes:
-ported hoodies from polaris/tg, I will place them somewhere someday
-fixed missing sec berets and badges missing sprites and being wrong at all
-fixed a lot of unecessary/troublesome code with the hos gear
-force gloves have a different sprite now
-fixed missing visible message when being hit by bullets
2016-12-22 20:07:01 +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
Alberyk
2c6dad2dd3 More bay merge fixes (#1243)
- Fixes #1227 
- Fixes #1236 
- Re-add lamarr.
- Fix bootknife thing
- Fix a couple of things related to borgs
- Re-add our tator items
- Adding back all the hardsuit modules back to robotics
- Fixing a couple of missing sprites, like fireaxe cabinet
- Fixed missing computer sprites when no power
2016-12-18 22:13:42 +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
skull132
0b26cd9ab1 Fix more things 2016-12-18 00:42:49 +02:00
skull132
1bf9e6a389 Fix all the things
YAAAAY!
2016-12-15 14:22:08 +02:00
skull132
16bf480525 Clean-up time!
Removing worthless files.
2016-12-11 21:45:21 +02:00
skull132
ff7f93cbd8 Saving + Updating + ALL THE THINGS
Everything. Absoloutely positively everything. Fuck.

Hey, it compiles now, doe!
2016-12-11 21:44:35 +02:00
skull132
5fbd15a846 Job sanitization
Because I forgot, K? Will runtime because I haven't added the second var yet but sure. Yay.
2016-12-11 01:39:00 +02:00
skull132
2b63c7e394 SQL Saves - Loading more vars
Forgot to load some of the new vars.
2016-12-11 00:35:58 +02:00
skull132
57501a305c SQL Loading - preferences vs character
A simple whitelist so we don't end up running bad queries when we only want the character.
2016-12-10 23:28:35 +02:00
skull132
7925063160 SQL Saves - Sanitization
Everything is now proper good sanitized!
2016-12-10 19:48:00 +02:00
skull132
7c8e6f730e Finalize loading queries
No more compile errors or logic errors from these.
2016-12-10 17:04:39 +02:00
skull132
cc1d254b6a Partially implement loading
TODO: sanitization
2016-11-21 01:01:40 +02:00
skull132
f7f2e72069 Pass 1 2016-11-18 18:05:32 +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
096d75a6e6 Jackboot and supply changes (#1124)
remove job restrictions from jackboots until more boots are added
add glowsticks and illegal gun crates to cargo, which is locked behind the supply contraband system
2016-11-07 00:25:12 +02:00
skull132
0b6120c1ac Server Greeting Refactor (#1034)
Refactors the Server Greeting datum to do majority of the processing clientside. No longer will we be holding massive spans of text in memory, and looking over them for shits and giggles.
2016-11-06 13:59:22 +02:00
skull132
9a4c6343e7 Merge branch 'master' into development 2016-11-04 14:19:38 -04:00
skull132
7ec9dfa156 Fixes #1103 & discord spam (#1106)
Fixes the robot FT saving issue and the discord spam that comes from BOREALIS using @here for CC messages. To be fixed more thoroughly in dev.
2016-11-02 22:38:05 +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
LordFowl
660a5d0063 Miscellaneous Content Patch (#1002)
rscadd: "Added three new energy-based weapons, one designed purely for pest-control."
rscadd: "Added a new rare handpistol, based off of a proposed competitor to the NT Mk58."
rscadd: "Added a new pet for the Head of Security - the PTR-7 Tranquilizer Rifle."
rscadd: "Syndicate manhack delivery grenades are now available via the traitor uplink."
rscadd: "Manhacks will no longer attack anyone belonging to the 'syndicate' faction, including Heist pirates."
tweak: "Tweaked loadout customisation whitelists, generally making them more restrictive by role."
bugfix: "It is no longer possible to be older or younger than your species ought to be."
2016-10-22 23:26:42 +03:00
Werner
774ab1a43b Some bug fixes (#5) 2016-10-17 11:09:23 +03:00
skull132
1910f487af Conflict clearance, vol deux. 2016-10-07 00:59:00 +03:00
skull132
87e041aa75 Merge remote-tracking branch 'bay12-upstream/master' into development 2016-10-07 00:58:39 +03:00
skull132
2fc96f13b4 Antag Contest Update (#1029)
Fixes #881
Contest: Fix assigning of self
Fix objective hoarding

Preferences Helpers
So we have an easier way of keeping track who's represented where and how.

Add aggressive objectives and remove passive ones.
2016-10-02 23:11:53 +03:00
skull132
66fa45b588 IE Stats (#1028)
Data with which we can determine how widespread actual HTML5 and CSS3 capability is.
2016-10-01 14:11:12 +03:00
Alberyk
0c8f3c007d Adding old code duffel bags and mercs/wizards bags (#817)
Bringing back our duffel bags and antags packbags from old code.
2016-08-27 18:22:05 +02:00
skull132
7281e1f951 Fixes #730 (#746)
AOOC is now added to players upon reconnecting, if they are an antag.

Technically a lazy fix, because the verb should maybe be a mob verb instead, and thus be added automatically. But hey, it works.
2016-08-14 22:07:04 +03:00
skull132
c331042b9c Antag Competition Implementation (#703)
Nominating for worst code 2016

Adds in custom objectives for the antag competition
Adds in a verb for players to assign their character's allegiences and to later edit them
Adds in a verb for players to request objectives relating to the contest
Adds in the logging of contest results
Modifies the objective system to facilitate objectives that require regular checking (such as the brigging one, which was not functional up until now)
2016-08-09 01:36:21 +03:00
NanakoAC
d6803a26e3 Respawning Tweaks (#646)
changes:

rscadd: "Respawn timers are now tracked individually for playing as animals (mice), small synthetics (drones and pAIs) and crew (everything else). This means you can now play as a mouse or drone while waiting to respawn as a full crewmember.".
tweak: "You can now spawn as a drone immediately upon joining as an observer, without having to wait ten minutes. There is still a cooldown between respawning as a drone if you just died as one."
tweak: "Slightly improved the error messages if you try to respawn when you've not waited long enough."
In addition, unlisted changes:
The admin verb 'Allow player to respawn' now sets all three respawn timers
Respawn times are now centralised in setup #defines, for easier editing in future
Nonliving mobs will no longer attempt to ghost when deleted. A comment in mob.dm explains this change
2016-08-03 22:34:41 +03:00
Alberyk
af304c93e2 Adding more skrell accessories and neck bandannas (#662)
This: http://forums.aurorastation.org/viewtopic.php?f=18&t=6677
And Araskael spritted the neckerchief bandannas. 
Also, adding cigar cases and cigarettes back as well to the custom loadout.
2016-08-03 22:34:10 +03:00
NanakoAC
40b1cec944 PAI Candidacy Fix (#666)
Fixes #108 
Fixes #661 
Fixes #608
2016-08-03 22:33:44 +03:00
skull132
b5b1f7abad Not hard-deleting characters (#552)
Characters are no longer hard deleted from the database.
This makes it so that persistent records about characters can't be fucked up.
2016-07-11 16:53:42 +03:00
skull132
3663ddcfed Welcome Screen (#535)
The idea is to consolidate all of the spam that you see on the lower right panel into one concrete, semi-persistent pop-up window. Utilizing bootstrap, it'll show you a neat welcome screen, the message of the day, staff memos (if accessible), and a personalized set of notifications. The system is set up for easy future expansion, as well.
2016-07-11 16:48:58 +03:00
skull132
443a49a49b Merge branch 'master' into development 2016-07-10 14:25:54 -04:00
LordFowl
a6c1085e37 Fowl's Bugfixes 1 (#521) 2016-07-10 01:13:29 +03:00
Werner
7b25937ce9 CCIA Records (#520)
Display CCIA Records and Actions on the Employment Computer.
2016-07-09 03:13:04 +03:00
Alberyk
e397f64791 Fixing science armbands and add scrubs to loadout, fixes #99 (#507)
Science armbands should be available again from the custom load-out.
2016-07-06 00:32:04 +03:00
LordFowl
1cfb3086de Preference edits (#473)
Makes several lorefriendly changes to chargen.
Permits numbers in chargen naming for the benefit of IPCs.
Permits chargen fluff to be viewed via employment record consoles and ID cards.
2016-06-30 02:35:20 +03:00
LordFowl
56e288e910 Vaurca Content 2 (#426)
Vaurca hivemind language added.
Vaurca appropriate name generator added.
Tied Vaurca language to their neural socket organ.
Added a method for non-Vaurca to intercept the Vaurca hivenet so long as they construct the correct item.
Sprites for Vaurca organs.
Neutered all Vaurca.
Cutting open a Vaurca for surgery now requires heavier equipment.
Injecting a Vaurca with a syringe now will take time.
Adds various Vaurca cosmetic items available via loadout.
Adds a few new burst-fire weapons exploiting the burstfire fix - obtainable via research or adminbus.
Ports the ability to stick heads on spears from Paradise-code.
Added an error message when trying to bite someone before the cooldown expires.
Removed spoken Vaurca language.
Heavily nerfed K'ois' properties.
Halved the nutrition value of nutriment, returning it to old-code state.
Nerfed the damage dealt by bite, while reducing the cooldown.
Fixed burstfire weapons spamming attack messages when fired, allowing for more automatic weapons.
Fixed Vaurca player ability to select coloured eyes.
2016-06-24 14:55:44 +03:00
skull132
b70cbfac22 Version Bump to 510.1347 (#438)
Updates the TravisCI config to use the latest stable BYOND release.
Adds client version control taken from /TG/station.
Updates the recommended version for hosting.
2016-06-23 14:45:15 +03:00
skull132
d3d53a9c4d Config Age Restrictions (#437)
Backports the old age restrictions system from old code. Age restrictions can now easily be applied by simply modifying a text file.
2016-06-23 02:13:43 +03:00
skull132
5d85c7c06f Merge remote-tracking branch 'origin/master' into development 2016-06-22 10:56:26 -04:00
Alberyk
e9c0dce6cf Adding more options to the custom loadout (#401)
Adding regular gloves for tajaran and unathi, besides the Synthetic Intelligence Movement armband and the return of the wallet.
2016-06-20 16:13:42 +03:00
skull132
3217de8b83 Fixes #370 (#376)
Characters that somehow get a datum as their h_style or f_style are now saved properly. Primarily concerning the Vaurca.
2016-06-04 22:45:06 +03:00
skull132
124b3d3911 Fixes #366 (#367)
* Skills are now properly loaded from the database.
* Skills are now properly migrated from old format to the database.
2016-06-01 21:25:36 +03:00
skull132
bf45c9e872 Dev Bug-fixes (#354)
* Runtime Fix - parse_db_lists()
Type mismatch.

* Remove Debug
Debug verbs from SQL saving.
2016-05-31 00:43:13 +03:00
skull132
7dacaa28dd SQL Saving - Rewrite + Implenetation (#350)
Rewrite's Mahzel's SQL character and preference saving.
Introduces easy config switching between the new and old system, with no troubles at all.

Also introduces better logging for DBQuery/proc/parseArguments(), should something go wrong. And classes SQL query errors as full on error snow, as opposed to debug data.
2016-05-30 23:39:07 +03:00
LordFowl
f85e66640b Compatibility Patch
Modifies grown.dm, station.dm, snacks.dm, and preferences.dm to be
compatible with the latest devbuild.
2016-05-05 20:32:40 -04:00