cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 17:11:22 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,140 Commits 74 Branches 23 Tags
5fbd15a846747d55a4396f97d922dcb6332a0bb0
Commit Graph

22710 Commits

Author SHA1 Message Date
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
00a2067bf7 Merge branch 'development' into merge/sql_saves_new 2016-12-10 15:35:10 +02:00
Bedshaped
48f9c995b6 FINISHED ALL NON-PREF ERRORS (#27) 
* code\game\machinery\cryopod.dm:482:error: orient_right: undefined var

* code\modules\mob\mob_movement.dm:272:error: mob.last_move_intent: undefined var

* code\modules\mob\living\simple_animal\simple_animal.dm:377&402:error: user.changeNext_move: undefined proc

* code\modules\mob\living\silicon\robot\robot_items.dm:31:error: loaded_item.reliability: undefined var

* fixes whatever to do with chameleon.dm

* camera.dm

* didn't get chameloeon the first time round

* uplink.dm

* code\game\objects\items\devices\PDA\PDA.dm:959:error: U.last_target_click: undefined var

* code\modules\clothing\head\misc_special.dm:159:error: icon_head: undefined var
 2016-12-04 19:39:20 +02:00
Werner
a1a1d6c17e Some more bug fixes (#26) 
Some more bugfixes.
The Windoor changes from Nanakos pull might conflict.
So merge that first and I´ll resolve as needed.
 2016-11-30 18:30:06 +02:00
NanakoAC
f7476fa9d7 Nanako's compile fixes (#25) 
Various compile error fixes. windoor stuff, ID, emag, holders marked for farther fixing later.
nothing too remarkable
 2016-11-30 18:28:58 +02:00
Alberyk
053d88f450 Clearing more errors (#24) 
Clears tray scanner related errors.
 2016-11-30 18:27:59 +02:00
Alberyk
5bfa01d79e Syndicate borg fix mk II and bees. (#23) 
Reverting back to old code, but, now fixing all the issue, and fuck ghost trap for this for now.

Also, re-adding our unique murderous bees.
 2016-11-27 20:00:35 +02:00
skull132
a0aa10837e Reduce more compiles 2016-11-27 18:34:26 +02:00
Bedshaped
924507246d Clearing compiles (#22) 
I gave IS_SYNTHETIC the same value as it has on our repo, hopefully that lazy fix is okay. I didn't want to search trhough where it's usually first assigned
 2016-11-22 22:21:35 +02:00
NanakoAC
879f3faef8 Istype (#20) 
Fixes a couple of is errors with missing functions.
Added isDrone as macro

restored the various is non macro functions. i don't know how or if they could be macro-ized
 2016-11-22 20:25:28 +02:00
Alberyk
e1b604df92 More fixes (#21) 
Removing some meteorhit procs and reliability related changes.
 2016-11-21 18:11:36 +02:00
NanakoAC
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
NanakoAC
36399d3cb9 fixed floorlayer compile errors, added can_burn to wood floors (#18) 
Fixes some compile errors with the floor layer, and adds the can_burn tag to wooden floors. For some reason tiles had it and wood didnt
 2016-11-21 12:48:28 +02:00
skull132
cc1d254b6a Partially implement loading 
TODO: sanitization
 2016-11-21 01:01:40 +02:00
skull132
e6c4b2a648 Merge branch 'development' into merge/sql_saves_new 2016-11-20 20:37:42 +02:00
NanakoAC
8181c3e15d Nymph hats (#15) 
Resolves five compile errors with nymphs wearing hats.

Nymphs can wear hats now.
I added a todo so we dont forget to test it out
 2016-11-20 14:27:21 +02:00
NanakoAC
cdb38b03eb Updateicons (#16) 
Fixes a couple compile errors with human/update_icons
 2016-11-20 13:23:34 +02:00
Werner
a878524089 Baymerge fixes (#13) 
86 errors
 2016-11-19 18:56:00 +02:00
Alberyk
65aa5ec4f0 Syndicate borg spawner upgrade (#11) 
This time using the ghost trap system from bay, this may not work, but it is clearing some errors related to those dm in particular.
 2016-11-19 18:55:21 +02:00
NanakoAC
92d442b9f0 Fixes some issues and reverts some changes to cyborgs (#14) 
Removed cyborg RCD upgrade
Fixed tox mod
Fixed four sound pref defines
 2016-11-19 18:54:51 +02:00
Werner
ab413348ff Baymerge fixes (#12) 
* Fixing compile errors

* Some more fixes

* Some more fixes
 2016-11-19 11:56:49 +02:00
Alberyk
908fc933f9 Fixing more error and the return of banhammer (#10) 2016-11-18 23:03:56 +02:00
skull132
f7f2e72069 Pass 1 2016-11-18 18:05:32 +02:00
Werner
3e92d63ddf Fixing compile errors (#9) 2016-11-18 18:03:27 +02:00
skull132
effb9ececf Processor defines & whitelist fix 
Removed the inefficient Bay method of handling ayylmao whitelists.
 2016-11-12 14:31:09 +02:00
Alberyk
38a0033b2e Fixing compile errors (#8) 
* Fixing more errors

* Update baystation12.int
 2016-11-12 12:47:43 +02:00
skull132
f75e1f3cca Indentation clearance + basic compiles 
Due to missing includes, primarily.
 2016-11-12 01:02:50 +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
skull132
ad1042d033 Development Fixes - 06NOV2016 (#1120) 
Fixes the mousebeam for more gibbings and ensures that nowhere is safe.
Fixes the multipliers because fuck.
Makes the night lighting process not runtime if night lighting is disabled. Note to Bed: del()-ing processes is bad, they should be disabled instead.
 2016-11-06 20:14:38 +02:00
skull132
faf81f15a1 Implement speed modifiers (#1119) 
Because linear addition does not retain proportional relationships! Mulipliers should take care of that, though, surely.
 2016-11-06 15:07:50 +02:00
NanakoAC
ca1f0b51db Nymph draining fix (#1114) 
Fixes nymphs being able to kill people by repeated blood sampling.
The amount drained will gradually drop off and never bring blood below half
 2016-11-06 14:00:46 +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
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
skull132
9a4c6343e7 Merge branch 'master' into development 2016-11-04 14:19:38 -04:00
NanakoAC
27e1d8f8c6 Sprint and Vehicle fixes(#1113) 
A number of bugfixes and under-the-hood tweaks. Nothing here needs changelog, and shouldn't really be noticed by players:

Fixes vehicles using stamina or moving faster when in sprint mode.
Fixes getting footstep sounds when driving a vehicle.
Changes cargo trains to use forceMove instead of move, for towing cars behind them. This fixes an issue where the train would become disconnected if the engine moved too fast.
Completely divorces vehicles from using mob speed vars at all, speed is defined on a per-vehicle basis.
Removes knockdown from sprinting exhaustion. Characters will now stop sprinting before they collapse.
 2016-11-04 21:18:40 +02:00
Bedshaped
d8a49afaf9 Night lighting (#1049) 
changes:

rscadd: "Added a button on APCs to set the area lights to a 'night-mode' which is dimmer and saves energy."
rscadd: "Added an automated system to turn 'night-mode' on in hallways between 6pm and 7am in station time."
 2016-11-04 01:19:39 +02:00
NanakoAC
492d287667 Toolbox and Sprint Tweaks (#1098) 
New feature! Toolboxes that are full of tools hit much harder, stun, and make a satisfying thunk. But they'll spill their contents everywhere, it's a one-shot thing

Fixes unathi being able to spam devour, and eat through faceplates

Slightly buffs IPC sprinting as requested by cake
 2016-11-04 01:16:05 +02:00
Alberyk
406c44c0e3 Changes to combat borg availability (#1104) 
Locks combat borg behind an extra keycard swipe thing, and a research upgrade, but, they can still be enacted via code delta or admin bus.
 2016-11-03 00:26:57 +02: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
Alberyk
e683fbe325 Chief engineer's hardsuit upgrade and more missing map things (#1096) 2016-11-02 21:18:31 +02:00
Werner
2590f4b7e2 Price change per jackboots request (#1099) 2016-11-01 11:03:48 +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
Bedshaped
f8147dc1c6 Mag lock changes (#1050) 
changelog:

rscadd: "New implementation of magnetic door locks, can be found in armory and eng secure storage."
soundadd: "Added hydraulic servo sounds."
devchangelog:
New helpers

Added check_neighbor_density(turf/T, var/dir) which checks if anything dense is on a tile next to T and return 1 if it is
Added is_type_in_view(var/type, var/dist = 0, var/center = src) and is_type_in_oview which will make a list from view and and return 1 if something matches the declared type
 2016-10-30 22:54:18 +02:00
skull132
312ed30bf9 Merge branch 'master' into development 2016-10-30 13:18:37 -04:00
Alberyk
122f1e0ebe Fixing missing posters and new additions (#1093) 
Adds some new posters
Fixes #1078
 2016-10-30 20:12:31 +02:00
inselc
f11deb5f91 Bugfixes: hungry shades, IV drips, PDAs, smallbots and laptops (#1088) 
Fixes #1082 
Fixes #1081 
Fixes #979 
Fixes #1063 
Fixes #874 
Fixes #1006 
Fixes #1063 
Fixes #929
 2016-10-30 15:17:42 +02:00