cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 08:01:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,333 Commits 74 Branches 23 Tags
858690a62b8decb53e73e0968044dad94ece4786
Commit Graph

348 Commits

Author SHA1 Message Date
LordFowl
3cf94c66fc Fixes blobs and other stuff (#1513) 
Was supposed to contain a fix for Vaurca surgery, but I decided to greenlight this ASAP once I detected a critical bug with how blobs worked.
Fixes #1509
Fixes #1470
Fixes #1506
Fixes #1501
Fixes #1484
Fixes #1466

Also replaces a lot of Vaurca checks with isvaurca() so that Shells don't start doing weird shit.
 2017-01-11 22:24:39 +02:00
skull132
708af1bc12 Fix mining drill hatch (#1479) 
They can now be closed again.
 2017-01-09 01:06:06 +02:00
Alberyk
1c17f110ee Fixing hides and accessories/custom loadout changes (#1404) 
-fix all the issues related to the leather things, as in they been just metal sheets, by adding leather materials and some things you can build with them.
-add a carp and corgi costume
-add some new accessories, like a new holster, the atlas armband that everyone wanted and some new medals
-add more things to the custom loadout, like the tracksuit things
-turns the waistcoat and suspender into accessories too
-fix the captain's medal at spawn being utter fucking broken
-add xeno sprites for the hazard suit
-add some more things to the cargo warehouse, like hides and winter coats
-replace force gloves sprites with cake's version
-add more jumpsuits that you can roll up sleeves
-stun from tabling someone is random now instead of a fixed ammount
 2017-01-07 13:00:22 +02:00
LordFowl
fdafaf39b5 BayMerge DLC Pack (#1355) 
Ports totally;
https://github.com/Baystation12/Baystation12/pull/12389/files
Baystation12#14599
Ports partially;
Baystation12#14216 (only blob-related functions)

All the failure messages have been replaced with failure events in industrial drills, that range from probably lethal to certainly lethal and in one case just moderately annoying.
 2017-01-05 00:06:44 +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
skull132
87e041aa75 Merge remote-tracking branch 'bay12-upstream/master' into development 2016-10-07 00:58:39 +03:00
Alberyk
bd9aa86b33 Adding more features to guns (#768) 
In this new gun patch:

-rewritting bolt action rifles, so they are less shotgun like, also new sounds for them!
-adding a spin cylinder verb for the revolver
-jamming mechanics for guns, only the ghetto .45 pistol will use them atm
-minor changes to renegades, removing big shotgun that won't make it really stealthy, and heisters, by adding more guns.
 2016-08-27 18:24:19 +02:00
Alberyk
14c6b05842 Autolathe additions, combat hyposprays and tommyguns to the uplink (#735) 
Adding more ammo options to the autolathe, as well suit cooling units for ipcs, the tommy gun for tators and fixing some borked crate prize at mining.
 2016-08-15 00:37:08 +03:00
Alberyk
36cacd28a4 Gun update (#387) 
This pull adds bolt actions rifles, they are like pump shotguns, with the capacity for 5 7.62mm bullets.
Also adds a 7.62mm clip in the hacked autolathe. Raiders have a chance to spawn with one.
 2016-06-23 02:16:57 +03:00
Ccomp5950
ededd3dd4d Fixes #12090 2016-01-31 20:43:08 -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
ccomp5950
ca55595f1b Makes the mining asteroid airless again. 
This turf surrounds the edges of the map.

air was "leaking" through it from off the map filling the zones that touch it with air.

fixes: #11365
 2015-12-30 00:13:12 -05:00
PsiOmegaDelta
df55f3d155 Rotational icons. 
/icons/turf/walls.dmi - rock_side
Made rock_side rotational, adjusted code as necessary.
Fixes an incorrect icon state reference.
 2015-12-08 16:13:55 +01:00
Zuhayr
e6ec26bb0a Tweaks to the previous commits. 2015-12-01 02:14:47 +10:30
Zuhayr
958e11387d POCKET SAND! 2015-12-01 02:04:10 +10:30
Zuhayr
ff353fdd9b Renamed silicates to sand. 2015-12-01 02:04:09 +10:30
PsiOmegaDelta
a7fa8cde49 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/clothing/spacesuits/void/merc.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/borer/borer_captive.dm
	code/modules/mob/mob_grab_specials.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	html/changelogs/.all_changelog.yml
 2015-09-11 08:54:03 +02:00
PsiOmegaDelta
f81ac77884 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/silicon/ai/ai.dm
 2015-09-11 08:38:28 +02:00
mwerezak
b9ee4ebc5e Merge branch 'master' into abandonedcrates 2015-09-10 15:21:15 -04:00
mwerezak
67fd31bd3e Abandoned crates now again use unique digits for their codes 2015-09-10 00:42:14 -04:00
PsiOmegaDelta
2007004f3c Qdel cleanup. 
Replaces a few instances of del() with qdel().
 2015-09-09 12:20:33 +02: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
Atlantis
e0a70d24ba Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoronwindowsv2 2015-09-01 03:22:08 +02:00
PsiOmegaDelta
a0a09c04e4 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 2015-08-20 14:09:07 +02:00
Kelenius
7c1d9b5614 Mech chargers are now a single machine 
Can be built and upgraded
Resolves #5215
 2015-08-16 06:07:36 -07:00
Zuhayr
c8baafed2a Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and 
construction/deconstruction. Major map rework/changes.
 2015-08-16 06:05:21 -07:00
PsiOmegaDelta
77d0bbd643 Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/game/gamemodes/changeling/modularchangling.dm
 2015-08-13 08:09:28 +02:00
PsiOmega
e875a7ce48 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/machinery/computer3/buildandrepair.dm
	code/game/objects/items/devices/lightreplacer.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
 2015-08-08 15:34:51 +02:00
mwerezak
0ceb0e291d Fixes #10314 
Replaces every check for a hardcoded material stack type with a check
for material of the stack.
 2015-08-02 00:01:10 -04:00
PsiOmegaDelta
c28b3721b4 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
 2015-07-31 10:00:16 +02:00
Atlantis
47f0b47c46 Borosilicate windows 
- This is the second part of my PR that added phoron windows to protect the SM core from fires
- Borosilicate windows are heat resistant  versions of regular glass windows. This PR renames them (from phoron windows/phoron glass/etc.) and adjusts the fire resistances
- They are no longer completely fireproof. Instead, all window types have fire resistance variables - maximal safe temperature and amount of damage taken if temperature exceeds this limit.
- Regular: 100C, Regular Reinforced: 750C, Borosilicate: 2000C, Borosilicate Reinforced: 4000C.
- Adds alloying recipe to make borosilicate glass. 2 sand + 1 platinum alloy.
 2015-07-27 13:49:12 +02:00
Mloc
1d8e015334 fixes #10141 
also clean up alloy_data handling

Signed-off-by: Mloc <colmohici@gmail.com>
 2015-07-27 10:49:51 +01:00
PsiOmegaDelta
0ba7643217 Updates files as necessary to adhere to the new standard. 2015-07-27 09:32:51 +02:00
PsiOmegaDelta
34fdc4712e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/names.dm
	code/game/jobs/job/silicon.dm
	code/game/objects/items.dm
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/nano/modules/alarm_monitor.dm
	code/setup.dm
 2015-07-14 08:21:12 +02:00
PsiOmegaDelta
8da7141af1 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
 2015-07-14 08:11:11 +02:00
mwerezak
0fc12eb22b Fixes #9927 
Fixes issues with deca code crates.
 2015-07-13 00:45:36 -04:00
PsiOmegaDelta
9b4d09c974 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/_helpers/unsorted.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/grenades/emgrenade.dm
	code/modules/clothing/spacesuits/rig/rig_attackby.dm
 2015-07-11 10:58:49 +02:00
PsiOmegaDelta
339d08b20e Compilation fix. 2015-07-11 10:51:03 +02:00
PsiOmegaDelta
5575acccfd Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-07-11 09:51:24 +02:00
Loganbacca
09f502f8d7 Fixed spriteless item in xenoarch loot drop 2015-07-11 03:38:20 +12:00
Zuhayr
48cf00ca54 Merge with dev-freeze. 2015-06-21 20:45:47 +09:30
mwerezak
f8d5127078 Adds SLOT_EARS to various items 2015-06-21 01:45:43 -04:00
PsiOmegaDelta
cc7c502fb8 Updates emag attackby usages to emag_act where it's not too much of a headache. 2015-06-16 09:34:13 +02:00
Zuhayr
ebe62cefd8 Refactored random map generator system and added several terrain generators. 
Created a global list to track base turfs for explosions/shuttle moves.
Remaps the asteroid to be a moonlet. Tidies up some references to 'asteroid', removes moonbase from the accessible z level list.
 2015-06-03 04:36:19 +09:30
Kelenius
3bdb5ff9ea Merge branch 'dev' into ofResearchAndPrototypes 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/leather.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/kitchen.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm
 2015-05-22 19:26:39 +03:00
Kelenius
35a20002c6 Merge branch 'dev' into ofResearchAndPrototypes 
Conflicts:
	baystation12.dme
	code/defines/obj/weapon.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
	code/game/mecha/mecha_parts.dm
	code/game/objects/items/devices/flash.dm
	code/game/objects/items/devices/powersink.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/RCD.dm
	code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
	code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
	code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
	code/game/objects/items/weapons/circuitboards/machinery/pacman.dm
	code/game/objects/items/weapons/circuitboards/machinery/power.dm
	code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
	code/game/objects/items/weapons/circuitboards/machinery/research.dm
	code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
	code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
	code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
	code/game/objects/items/weapons/flamethrower.dm
	code/game/objects/items/weapons/handcuffs.dm
	code/game/objects/items/weapons/kitchen.dm
	code/game/objects/items/weapons/shields.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/teleportation.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/assembly/igniter.dm
	code/modules/assembly/infrared.dm
	code/modules/assembly/mousetrap.dm
	code/modules/assembly/proximity.dm
	code/modules/assembly/signaler.dm
	code/modules/assembly/timer.dm
	code/modules/assembly/voice.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/mining/drilling/scanner.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/ore.dm
	code/modules/mob/living/silicon/robot/analyzer.dm
	code/modules/power/rust/circuits_and_design.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/guns/energy/laser.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/designs.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm
	code/modules/research/research.dm
	code/modules/research/server.dm
	code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
 2015-05-20 11:50:28 +03:00
Zuhayr
ed34aa2466 Rebalancing and adjusting divisors for all weapon damage values. 2015-05-17 16:51:55 +09:30
Zuhayr
358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
Zuhayr
8aa24b86bb Renamed shards, katanas, claymores. 2015-05-16 20:36:33 +09:30