cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-25 08:42:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,244 Commits 75 Branches 23 Tags
982bf9b1a1fa21ebad94deab0819b5b5f313d298
Commit Graph

373 Commits

Author SHA1 Message Date
Alberyk
5a54b7a030 Replacing the station nuclear bomb with a terminal (#1316) 
Due to admin's decision, the station nuke is being replaced with a terminal. Pretty much porting this from the newest bay dev branch.

Other changes:
fix a messed up syndie borg sound
fixes #1308
 2016-12-26 17:14:11 +02:00
skull132
cdd4772177 Merge branch 'master' into merge/level_dev_master 
# Conflicts:
#	code/game/machinery/vending.dm
#	maps/exodus-1.dmm
#	maps/exodus-2.dmm
 2016-12-19 00:23:19 +02:00
LordFowl
c46ae8cb42 Christmas Update (#1203) 
Several minor mapping changes, basically accounting to stringing up christmas lights and wreaths. Some chairs and tables were removed to make way for glorious Christmas Tree. May their sacrifices be well remembered.
 2016-12-06 17:01:21 +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
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
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
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
15cad446e6 Merge branch 'master' into development 2016-10-29 11:47:42 -04:00
inselc
7443629d82 Bugfixes: Welding tool, Constructs, Runes (#1072) 
Fixes #1066 
Fixes #1065 
Fixes #1053
 2016-10-29 14:46:19 +03:00
NanakoAC
c4b36a5490 Sprinting, Stamina and Temporary Modifiers (#1030) 
Introduces:
- Temporary modifiers process and datums for that
- A new stamina and sprinting mechanic. That is in need of further development! Weee!
 2016-10-26 18:22:39 +03:00
skull132
87e041aa75 Merge remote-tracking branch 'bay12-upstream/master' into development 2016-10-07 00:58:39 +03:00
Alberyk
4318c9c7a1 Resolve #615 (#1013) 2016-09-28 23:08:20 +03:00
NanakoAC
804851f6f6 Diona Overhaul - SEP2016 (#442) 2016-09-09 23:55:48 +03:00
NanakoAC
2fcd1eccd3 Special Swords and amputation (#715) 
changes:

rscadd: "Chainswords now have an improved animation."
rscadd: "Chainswords and energy blades can no longer get embedded in people."
rscadd: "Chainswords and energy blades can now be used as surgical tools to amputate limbs. Chainswords are messy. Energy blades will cut clean and cauterize the wound"
tweak: "Surgery messages about amputating bodyparts are now very noticeable"
tweak: "Cauterising wounds with a welding tool is much more reliable. Cauterising with a cigarette is no longer effective."
bugfix: "Fixed chainsword held sprite not updating when toggled"
 2016-08-15 00:36:28 +03:00
Alberyk
83ed43896e Allowing energy weapons and chainswords to slice apart regular walls (#645) 
All energy weapons and chainswords can slice apart regular walls, as suggest in the forums, sometime ago.
 2016-08-02 21:46:35 +03:00
LordFowl
a6c1085e37 Fowl's Bugfixes 1 (#521) 2016-07-10 01:13:29 +03:00
Alberyk
11126fff4a Fixes #321 
Fixes wet floortiles never drying. Ported from Polaris.
 2016-06-20 19:00:31 +03:00
skull132
0b85a4321f Porting Zuhayr's Fixes For Forensics 2016-02-01 17:31:29 +02:00
skull132
fe48f26d71 Porting forensics from Aurora. 2016-02-01 17:08:47 +02:00
Chinsky
978b4a58c5 Merge pull request #12049 from PsiOmegaDelta/160126-Background 
Fixes water and dirt.
 2016-01-26 21:40:40 +03:00
PsiOmegaDelta
6089ccccea Makes events global. 
Greatly decreases the number of objects that need to be created (currently 3 event handlers in total vs basically 3 per datum)
The price is a slower lookup of listeners but on a per round basis it should still be much less than the current startup time penalty.
 2016-01-26 13:12:37 +01:00
PsiOmegaDelta
2474054585 Map: Of water and dirt. 
Fixes dirt amounts not updating properly.
Adds beach and water turf definitions.
 2016-01-26 10:55:05 +01:00
ccomp5950
58b9740df6 Fixes runtime I noticed during Malf. 
Something spawns out on random space tiles during round start, might be malf but eh.

runtime error: Cannot execute null.HasProximity().
proc name: Entered (/turf/Entered)
  source file: turf.dm,147
  usr: null
  src: space (246,55,4) (/turf/space)
  call stack:
space (246,55,4) (/turf/space): Entered(null)
 2016-01-15 21:22:36 -05:00
Ryan784
1072aa68d9 Footstep Sounds + ASFX Tab 
Footstep sounds and the ASFX Tab is back! You can not only hear
footsteps once again, but enable/disable the voting sound.
 2016-01-14 18:28:09 -05:00
PsiOmegaDelta
95d73b8b71 Makes the floor wetness proc use the scheduler instead of sleeping. 2016-01-13 10:37:31 +01:00
Zuhayr
7439b7bcf4 Attempting to fix perma-wet-floors bugs. 2016-01-12 08:59:59 +01:00
PsiOmegaDelta
fcc8389203 Floor construction now checks stack subtypes. 
Fixes #11930.
Also makes the robot fabricator use proper paths because I found it while searching for build type.
 2016-01-07 17:14:09 +01:00
PsiOmegaDelta
b22d7c58bb Makes it possible to connect to cable nodes on shuttle plating. 
Fixes #11852.
 2016-01-03 12:49:27 +01:00
PsiOmegaDelta
a2a5e367f6 Adds a chilled N2 canister to Research Server room. 
With minor cleanup included. Fixes #11790.
 2016-01-02 19:15:59 +01:00
PsiOmegaDelta
0922cf5e2f Floor decals now layer below the turf layer. 
This doesn't actually make them invisible, as turfs will always display below everything else, but will ensure decals display below anything else on turf level.
Fixes #10754. Fixes #11826.
 2015-12-30 18:07:46 +01:00
PsiOmegaDelta
b919181452 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/turfs/simulated/wall_attacks.dm
 2015-12-28 19:44:19 +01:00
PsiOmegaDelta
949d3d0c7f Merge pull request #11770 from Baystation12/master 
Dev-feeeze
 2015-12-28 16:32:46 +01:00
ccomp5950
8614484408 Hidden doors when open can be seen through. 
Fixes #11765
 2015-12-27 19:17:21 -05:00
ccomp5950
6736fb54e7 Merge branch '_base-turf' of https://github.com/mwerezak/Baystation12 into dev 
Conflicts:
	code/game/area/Space Station 13 areas.dm
 2015-12-17 20:25:36 -05:00
Hubblenaut
3127ee28b5 Fixes subcategories of floor tiles not being placable 2015-12-11 11:08:36 +01:00
Zuhayr
c4c63b5d19 Forensics fixes/tweaks. 2015-12-10 19:34:28 +10:30
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
Jon
c9b7a8ece3 Updates all get_base_turf usages to get_base_turf_by_area. 
This means that instead of the base turf being defined by the z-level, it's now defined by area and defaulted by z-level.

Updates all "shuttle" and "solar" areas to have a base_turf of space.
Updates docking arms 1, 2, and 3 on the main asteroid level to have a base_turf of space.

Other z-levels may still need updating.

This change means that all actions which destroy or dismantle a tile - for example bombs, a singularity, a shuttle leaving, or deconstruction - now leave these new areas as space not asteroid. Future mapping efforts may need to take this into account.

Conflicts:
	code/game/area/Space Station 13 areas.dm
 2015-12-06 14:01:21 -05:00
mwerezak
87648e86ef Fixes runtime when cleaning turfs with soap 
Partial fix of #11490
 2015-12-06 02:00:50 -05:00
Zuhayr
14c39c6ba4 Merge pull request #11559 from PsiOmegaDelta/151202-InfraredFix 
Fixes proximity sensors being passed turfs/areas
 2015-12-04 04:16:31 +10:30
Zuhayr
63c4da0f9f Fixes reset decals not destroying themselves. 2015-12-02 18:17:26 +10:30
Zuhayr
a90c2ca077 Runtime fixes. 
(cherry picked from commit 0cf0b726608ca07ae456441355b399095f21dffc)
 2015-12-02 08:37:09 +01:00
Zuhayr
9c0ae7fb01 Merge branch 'auroraforensics' of https://github.com/Zuhayr/Baystation12 into dev 2015-11-22 19:45:55 +10:30
PsiOmegaDelta
88d85c16fa Scheduler now uses btime. 
Partial port of https://github.com/ParadiseSS13/Paradise/pull/1540.
 2015-10-24 12:53:04 +02:00
Zuhayr
1244c4a5fd Porting forensics from Aurora. 2015-10-24 02:15:06 +10:30
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
fa6319d52d Turf initialization tweaking. 
Removes the need for a spawn() in New().
 2015-09-27 13:18:18 +02:00
Zuhayr
d1e2257218 Merge pull request #11189 from PsiOmegaDelta/150925-BrokenFloor 
Map tweaks.
 2015-09-27 15:05:56 +09:30
SkyMarshal
c06c3cd245 Adds airless steel floor and blue carpet edge mapping prefabs. 2015-09-26 16:27:47 -07:00