cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,213 Commits 73 Branches 18 Tags
f0f8952a1de436db1c0b32a25a4a2bc737c6232c
Commit Graph

337 Commits

Author SHA1 Message Date
SonixApache
587297e906 ethylredoxrazine now removes alcohol when metabolized (#26473) 
* ethylredoxrazine now turns all booze into water

* water2wine spell, become as jesus

* comments

* no default, adjust callers, don't test before pushing
 2020-05-20 22:20:14 -05:00
boy2mantwicethefam
397e7aadc2 apparently this isn't a thing (#26332) 2020-05-04 16:37:51 -03:00
DamianX
5399c3b0f3 Fixed a bunch of linter warnings (#26360) 
* Fixed a bunch of linter warnings

* Fix everything, maybe break something

* Fixed Time Stop not being cast by Arcane Golems

* Fixed arguments of remove_from_storage

* Fixed gun/afterattack arguments

* Fixed gun/Fire arguments

* Fixed arguments to candle/light and mob/emote

* Fixed arguments to simple_animal/revive, simple_animal/gib, robot/drop_item, mob/flash_eyes
 2020-05-03 16:06:40 -03:00
ShiftyRail
9ae2db92e8 Add a funny effect to ring of fire (#26289) 
* Add a funny effect to ring of fire

* fixes

* removes short-lived fire
 2020-04-28 13:41:10 +02:00
DamianX
f77b7e8977 Removed a bunch of references to src in global procs (#26291) 
* removed src from equip_vox_raider

* removed src from explosion

* removed src from wages.dm and ethereal_jaunt.dm
 2020-04-23 22:29:09 +02:00
ShiftyRail
8cfdc095d9 Actually fixes AStar runtimes (#26264) 2020-04-21 09:35:47 -03:00
ShiftyRail
9c776718c4 Fixes some runtimes with bots. (#26201) 2020-04-14 14:29:29 -03:00
ShiftyRail
3ea3e9c1a4 Unfuckups the fuck-up boots (#26121) 
* Unfuckups the fuck-up boots

* FU

* more tweaks

* g*d
 2020-04-12 21:06:25 -05:00
ShiftyRail
a98d378854 AStar subsystem for bots (#26157) 
* Adds an ASTAR pathing sub

Adds a little crab bot that Astar paths to wherever you click on the screen

Gunks up ASTAR with a bunch of debug (colouring tiles that are processed)

* Renames some variables for readability

Thanks to having renamed the variables, repairs the golden throne as the error was easier to find

* removes or locks away debug

* Astar path making sub

* Converts bots over to the new ASTAR logic, WIP as fixing race conditions

* Tear it down, and start again

* Fixes patrols and regular path making.

Cleanbots and floorbots now work.

Makes Old_target into a list of old targets, to avoid flip-flopping between two impossible tasks

* New arg for bots, step_for, int. Patrols and paths will make this many steps per call

Fixes farmbots

Fixes the cleanbots in ironchef and spessmart from doing weird stuff

* cleanbots

* Dracula bot

* ed bot, formatting

* ed bots, fixes

* medbots maybe

* mulebots part1

* trying to make it work

* mulebots part 2

* might help with a funtime

* it took me 8 hours to fix this stupid thing. also removes debug

* they're writing songs of love, but not for me :(

* less shit

* It WORKS mostly

* more details, less debugs

* AAAAH

* IT WORKS

* slowbots

* New subsystem, documentation

* Better

Co-authored-by: madmanmartian <lazyrobot@outlook.com>
 2020-04-12 20:58:37 -05:00
RealestEstate
ed4fa0136a Summon Pitbulls (#25883) 
* adds pitbulls and a conjure pitbull spell

* spell icon

* removed testing obj

* Treachery mechanic, code touch up, and pitbull bark

* removes the limiters, couldn't figure it out after 3 weeks fuck me

* fix merge conflict

* merge fixaroo this shit is like magic

* re-adds pitbull icons

* someday I will fix this merge conflict

* but not fucking today apparently

* removes a pointless comment

Co-authored-by: Acrylic Mimosa <>
 2020-03-10 20:26:35 -05:00
boy2mantwicethefam
d4595475a4 Update retard.dm (#25849) 2020-02-20 12:31:58 -06:00
boy2mantwicethefam
81d788d5d4 the return of brain damag involatucoiin the brain the brian bran diamaig invoccti omnn oj the rcminvot invociation invot incotvatoion hhe the return of brian brain the return of brain dmag dmage dmagmage the return of bria the return of bri the return of brain damage invoCV THE RETURN OF BRAIN DAMAGE INVOCATIONS (#25850) 2020-02-20 12:31:16 -06:00
boy2mantwicethefam
40c840911a Spell specialization clean-up (#25521) 
* stuff

* clean-up for the PR
 2019-12-30 08:48:27 -03:00
boy2mantwicethefam
968cdc64e4 Jaunt changes (#25524) 2019-12-29 08:45:21 -03:00
boy2mantwicethefam
8e459b5f64 Improved wizard cooldown logic (#25502) 
* changes

* Revert "changes"

This reverts commit 1bfb246620.

* Now it's just spell code for now
 2019-12-26 08:29:50 -03:00
Goldsteel
f3743b051c Fixes the thing (#25275) 2019-12-02 22:08:37 -06:00
ancientpower
3a54879eca New wizard spell #1: Heal Other (#24867) 
* new support spell #1

* fugg

* enloudened the sfx

* fixes

* fixes again
 2019-11-11 16:05:04 -06:00
ancientpower
93cc86bc5b New wizard spell #2: Pacify (#24871) 
* new support spell #1

* adjustment

* pre-emptively fixing icons to avoid conflicts

* re-implemented pacifism flag

* removed unnecessary vars

* oops

* oops again

* whoops 3

* fixes bad math

* math fix 2
 2019-11-11 11:32:35 -06:00
D3athrow
a33cdce2f2 Revert "Merge pull request #24866 from vgstation-coders/secure_the_spare" 
This reverts commit 3f057073db, reversing
changes made to 2d178d5eb1.
 2019-11-06 13:06:22 -06:00
D3athrow
3984e9b69e Changes if statement to use a list search as N3X15 suggested. 
Adds failsafe measure if there are no heads of staff in the manifest.
Ensures the summon spares spell is unaffected by this change.
 2019-11-05 18:13:41 -06:00
Probe1
80f0829ec8 Merge pull request #24659 from ancientpower/hydroponics-refactor 
Hydroponics icon refactoring
 2019-11-02 11:55:55 -04:00
ancientpower
b459ea3fde initial commit 2019-10-29 18:42:14 -05:00
Shifty/Anthomansland
2e38b2a2b8 Disorient is as powerful as it was before 2019-10-29 11:32:35 +01:00
Exxion
f245a20dcd Windows 2019-09-01 15:30:31 -04:00
GlassEclipse
656536a040 Starman, the One and Only (#23785) 
* 	modified:   code/datums/ai_laws.dm
	new file:   code/game/objects/items/robot/robot_items/starman_items.dm
	modified:   code/modules/mob/living/silicon/robot/robot_modules.dm
	new file:   code/modules/mob/living/silicon/robot/robot_subtypes/starman.dm
	modified:   __DEFINES/silicon.dm
	modified:   icons/mob/robots.dmi
	modified:   vgstation13.dme

* 	Changes to be committed:
	modified:   icons/mob/robots.dmi
	modified:   vgstation13.dme

* 	modified:   __DEFINES/silicon.dm

* 	modified:   __DEFINES/setup.dm
	modified:   __DEFINES/silicon.dm
	modified:   code/_onclick/cyborg.dm
	modified:   code/datums/ai_laws.dm
	deleted:    code/game/objects/items/robot/robot_items/starman_items.dm
	modified:   code/modules/mob/living/silicon/robot/life.dm
	modified:   code/modules/mob/living/silicon/robot/robot_modules.dm
	modified:   code/modules/mob/living/silicon/robot/robot_subtypes/starman.dm
	modified:   code/modules/spells/spell_code.dm
	modified:   icons/effects/effects.dmi
	modified:   icons/mob/robots.dmi
	modified:   icons/mob/screen1_robot.dmi
	modified:   icons/mob/screen_spells.dmi
	new file:   sound/effects/psi/psi_brainshock_omega.ogg
	new file:   sound/effects/psi/psi_shield_beta.ogg
	new file:   sound/effects/psi/psi_starstorm_omega.ogg
	new file:   sound/music/battle_against_a_machine.ogg
	new file:   sound/music/imbossible.ogg
	modified:   vgstation13.dme
 2019-08-18 19:15:46 -05:00
D3athrow
797ae15982 tweak time stop values 2019-08-18 11:32:58 -05:00
MadmanMartian
cef96f7c85 Summon pastry spell exploit fix (#23600) 
* Literally just spawning off pies so they don't end up being hyper-stackable

* egads
 2019-07-18 18:59:43 -03:00
GlassEclipse
919a296241 Merge https://github.com/vgstation-coders/vgstation13 into glasseclipse-branch 
modified:   __DEFINES/_macros.dm
	modified:   __DEFINES/global.dm
	modified:   __DEFINES/planes+layers.dm
	modified:   __DEFINES/reagents.dm
	modified:   __DEFINES/role_datums_defines.dm
	modified:   __DEFINES/setup.dm
	modified:   __DEFINES/spell_defines.dm
	modified:   __DEFINES/turfs.dm
	modified:   code/WorkInProgress/Cael_Aislinn/ShieldGen/circuits.dm
	modified:   code/WorkInProgress/Cael_Aislinn/ShieldGen/shield_gen.dm
	modified:   code/WorkInProgress/kilakk/fax.dm
	modified:   code/ZAS/Airflow.dm
	modified:   code/ZAS/ConnectionGroup.dm
	modified:   code/__HELPERS/game.dm
	modified:   code/_onclick/click.dm
	modified:   code/_onclick/hud/fullscreen.dm
	new file:   code/_onclick/mutual_cuff.dm
	modified:   code/_onclick/observer.dm
	modified:   code/_onclick/other_mobs.dm
	modified:   code/controllers/shuttle_controller.dm
	modified:   code/controllers/subsystem/supply_shuttle.dm
	modified:   code/datums/datumvars.dm
	modified:   code/datums/gamemode/dynamic/dynamic.dm
	modified:   code/datums/gamemode/dynamic/dynamic_rulesets.dm
	modified:   code/datums/gamemode/dynamic/dynamic_rulesets_latejoin.dm
	modified:   code/datums/gamemode/dynamic/dynamic_rulesets_midround.dm
	modified:   code/datums/gamemode/dynamic/dynamic_rulesets_roundstart.dm
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult.dm
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult_buildings.dm
	new file:   code/datums/gamemode/factions/bloodcult/bloodcult_data.dm
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult_items.dm
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult_runes.dm
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult_runespells.dm
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult_spells.dm
	deleted:    code/datums/gamemode/factions/bloodcult/bloodcult_words.dm
	new file:   code/datums/gamemode/factions/plague_mice.dm
	modified:   code/datums/gamemode/factions/syndicate/nukeops.dm
	modified:   code/datums/gamemode/misc_gamemode_procs.dm
	new file:   code/datums/gamemode/objectives/plague.dm
	modified:   code/datums/gamemode/role/catbeast.dm
	modified:   code/datums/gamemode/role/cultist.dm
	modified:   code/datums/gamemode/role/ninja.dm
	new file:   code/datums/gamemode/role/plague_mouse.dm
	modified:   code/datums/gamemode/role/rambler.dm
	modified:   code/datums/helper_datums/command_alerts.dm
	modified:   code/datums/religions.dm
	modified:   code/datums/supplypacks.dm
	modified:   code/datums/uplink_item.dm
	modified:   code/datums/wires/airlock.dm
	modified:   code/defines/obj.dm
	modified:   code/defines/procs/biohazard_alert.dm
	modified:   code/game/area/Space Station 13 areas.dm
	modified:   code/game/atoms.dm
	modified:   code/game/atoms_movable.dm
	modified:   code/game/data_huds.dm
	modified:   code/game/dna/genes/goon_disabilities.dm
	modified:   code/game/dna/genes/monkey.dm
	modified:   code/game/gamemodes/blob/blobs/factory.dm
	modified:   code/game/gamemodes/blob/powers.dm
	modified:   code/game/gamemodes/blob/theblob.dm
	modified:   code/game/gamemodes/gameticker.dm
	modified:   code/game/gamemodes/meteor/meteor_universe.dm
	modified:   code/game/gamemodes/meteor/meteors.dm
	modified:   code/game/gamemodes/scoreboard.dm
	modified:   code/game/gamemodes/wizard/artifacts.dm
	modified:   code/game/gamemodes/wizard/spellbook.dm
	new file:   code/game/gamemodes/wizard/spellbook_oneuse.dm
	modified:   code/game/jobs/job/captain.dm
	modified:   code/game/jobs/job/medical.dm
	modified:   code/game/jobs/job/science.dm
	modified:   code/game/jobs/job_controller.dm
	modified:   code/game/machinery/adv_med.dm
	modified:   code/game/machinery/atmoalter/scrubber.dm
	modified:   code/game/machinery/bees_apiary.dm
	modified:   code/game/machinery/bots/medbot.dm
	modified:   code/game/machinery/computer/buildandrepair.dm
	modified:   code/game/machinery/computer/camera.dm
	modified:   code/game/machinery/computer/medical.dm
	modified:   code/game/machinery/computer/security.dm
	modified:   code/game/machinery/computer/shuttle.dm
	modified:   code/game/machinery/constructable_frame.dm
	modified:   code/game/machinery/doors/airlock.dm
	modified:   code/game/machinery/doors/door.dm
	modified:   code/game/machinery/kitchen/gibber.dm
	modified:   code/game/machinery/kitchen/processor.dm
	modified:   code/game/machinery/machinery.dm
	modified:   code/game/machinery/rechargestation.dm
	modified:   code/game/machinery/teleporter.dm
	modified:   code/game/machinery/vending.dm
	modified:   code/game/mecha/combat/durand.dm
	modified:   code/game/mecha/combat/gygax.dm
	modified:   code/game/mecha/combat/marauder.dm
	modified:   code/game/mecha/equipment/tools/tools.dm
	modified:   code/game/mecha/mech_bay.dm
	modified:   code/game/mecha/mecha.dm
	modified:   code/game/mecha/working/clarke.dm
	modified:   code/game/objects/effects/decals/Cleanable/misc.dm
	modified:   code/game/objects/effects/decals/cleanable.dm
	modified:   code/game/objects/effects/gibs.dm
	modified:   code/game/objects/effects/spawners/bombspawner.dm
	modified:   code/game/objects/items.dm
	modified:   code/game/objects/items/crayons.dm
	modified:   code/game/objects/items/devices/PDA/PDA.dm
	modified:   code/game/objects/items/devices/chameleonproj.dm
	modified:   code/game/objects/items/devices/deskbell.dm
	modified:   code/game/objects/items/devices/geiger.dm
	modified:   code/game/objects/items/devices/mat_synth.dm
	modified:   code/game/objects/items/devices/modkit.dm
	new file:   code/game/objects/items/devices/reportintercom.dm
	modified:   code/game/objects/items/devices/scanners.dm
	modified:   code/game/objects/items/incense.dm
	modified:   code/game/objects/items/stacks/stack_recipes.dm
	modified:   code/game/objects/items/toys.dm
	modified:   code/game/objects/items/trash.dm
	modified:   code/game/objects/items/vouchers.dm
	modified:   code/game/objects/items/weapons/cosmetics.dm
	modified:   code/game/objects/items/weapons/grenades/chronogrenade.dm
	new file:   code/game/objects/items/weapons/grenades/syndigrenade.dm
	modified:   code/game/objects/items/weapons/handcuffs.dm
	modified:   code/game/objects/items/weapons/implants/implantfreedom.dm
	modified:   code/game/objects/items/weapons/manuals.dm
	modified:   code/game/objects/items/weapons/melee/energy.dm
	modified:   code/game/objects/items/weapons/shard.dm
	modified:   code/game/objects/items/weapons/storage/belt.dm
	modified:   code/game/objects/items/weapons/storage/boxes.dm
	modified:   code/game/objects/items/weapons/storage/fancy.dm
	modified:   code/game/objects/items/weapons/storage/firstaid.dm
	modified:   code/game/objects/items/weapons/surgery_tools.dm
	modified:   code/game/objects/items/weapons/switchtool.dm
	modified:   code/game/objects/items/weapons/teleportation.dm
	modified:   code/game/objects/objs.dm
	modified:   code/game/objects/storage/coat.dm
	modified:   code/game/objects/storage/gimmick_bundles.dm
	modified:   code/game/objects/structures/barsigns/vg.dm
	modified:   code/game/objects/structures/cage.dm
	modified:   code/game/objects/structures/crates_lockers/closets.dm
	modified:   code/game/objects/structures/crates_lockers/closets/job_closets.dm
	modified:   code/game/objects/structures/crates_lockers/closets/l3closet.dm
	modified:   code/game/objects/structures/crates_lockers/closets/secure/medical.dm
	modified:   code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	modified:   code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	new file:   code/game/objects/structures/mouse_cage.dm
	modified:   code/game/objects/structures/musician.dm
	modified:   code/game/objects/structures/stool_bed_chair_nest/bed.dm
	modified:   code/game/objects/structures/stool_bed_chair_nest/chairs.dm
	modified:   code/game/objects/structures/vehicles/gigadrill.dm
	modified:   code/game/objects/structures/vehicles/lightcycle.dm
	modified:   code/modules/admin/admin.dm
	modified:   code/modules/admin/admin_verbs.dm
	new file:   code/modules/admin/diseases_panel.dm
	modified:   code/modules/admin/topic.dm
	modified:   code/modules/admin/verbs/adminpm.dm
	modified:   code/modules/admin/verbs/debug.dm
	modified:   code/modules/admin/verbs/randomverbs.dm
	modified:   code/modules/client/client defines.dm
	modified:   code/modules/client/client procs.dm
	modified:   code/modules/client/global cache.dm
	modified:   code/modules/clothing/accessories/accessory.dm
	modified:   code/modules/clothing/accessories/holster.dm
	modified:   code/modules/clothing/clothing.dm
	modified:   code/modules/clothing/glasses/glasses.dm
	modified:   code/modules/clothing/gloves/miscellaneous.dm
	modified:   code/modules/clothing/head/misc.dm
	modified:   code/modules/clothing/masks/gasmask.dm
	modified:   code/modules/clothing/masks/miscellaneous.dm
	modified:   code/modules/clothing/monkeyclothes/monkeyclothes.dm
	modified:   code/modules/clothing/shoes/colour.dm
	modified:   code/modules/clothing/shoes/magboots.dm
	modified:   code/modules/clothing/shoes/miscellaneous.dm
	modified:   code/modules/clothing/spacesuits/alien.dm
	modified:   code/modules/clothing/spacesuits/rig.dm
	modified:   code/modules/clothing/suits/bio.dm
	modified:   code/modules/clothing/suits/labcoat.dm
	modified:   code/modules/clothing/suits/miscellaneous.dm
	modified:   code/modules/clothing/under/jobs/civilian.dm
	modified:   code/modules/clothing/under/jobs/medsci.dm
	modified:   code/modules/clothing/under/miscellaneous.dm
	modified:   code/modules/cmc/crew.dm
	modified:   code/modules/credits/episode_name.dm
	modified:   code/modules/detectivework/detective_scanner.dm
	modified:   code/modules/events/event_dynamic.dm
	modified:   code/modules/events/infestation.dm
	modified:   code/modules/events/ion_storm.dm
	modified:   code/modules/events/meteors.dm
	modified:   code/modules/events/organ_failure.dm
	modified:   code/modules/events/viral_infection.dm
	modified:   code/modules/events/viral_outbreak.dm
	modified:   code/modules/html_interface/map/station_map.dm
	modified:   code/modules/hydroponics/eggincubator.dm
	modified:   code/modules/hydroponics/spreading/spreading.dm
	modified:   code/modules/library/computers/base.dm
	modified:   code/modules/library/computers/checkout.dm
	modified:   code/modules/library/lib_items.dm
	modified:   code/modules/maps/nests.dm
	modified:   code/modules/maps/spawners/spawners.dm
	modified:   code/modules/media/broadcast/receivers/radio.dm
	modified:   code/modules/mining/materials.dm
	modified:   code/modules/mining/mine_items.dm
	modified:   code/modules/mining/mine_turfs.dm
	modified:   code/modules/mining/ores_coins.dm
	modified:   code/modules/mob/dead/observer/observer.dm
	modified:   code/modules/mob/death.dm
	modified:   code/modules/mob/inventory.dm
	modified:   code/modules/mob/living/carbon/alien/death.dm
	modified:   code/modules/mob/living/carbon/alien/humanoid/combat.dm
	modified:   code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
	modified:   code/modules/mob/living/carbon/alien/humanoid/inventory.dm
	modified:   code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
	modified:   code/modules/mob/living/carbon/alien/larva/inventory.dm
	modified:   code/modules/mob/living/carbon/brain/death.dm
	modified:   code/modules/mob/living/carbon/carbon.dm
	modified:   code/modules/mob/living/carbon/carbon_defines.dm
	modified:   code/modules/mob/living/carbon/combat.dm
	modified:   code/modules/mob/living/carbon/complex/examine.dm
	modified:   code/modules/mob/living/carbon/complex/martian/martian.dm
	modified:   code/modules/mob/living/carbon/human/death.dm
	modified:   code/modules/mob/living/carbon/human/examine.dm
	modified:   code/modules/mob/living/carbon/human/human.dm
	modified:   code/modules/mob/living/carbon/human/human_attackhand.dm
	modified:   code/modules/mob/living/carbon/human/human_damage.dm
	modified:   code/modules/mob/living/carbon/human/human_defense.dm
	modified:   code/modules/mob/living/carbon/human/human_movement.dm
	modified:   code/modules/mob/living/carbon/human/inventory.dm
	modified:   code/modules/mob/living/carbon/human/life.dm
	modified:   code/modules/mob/living/carbon/human/life/handle_breath.dm
	modified:   code/modules/mob/living/carbon/human/life/handle_hud_list.dm
	modified:   code/modules/mob/living/carbon/human/life/handle_random_events.dm
	modified:   code/modules/mob/living/carbon/human/life/handle_regular_hud_updates.dm
	modified:   code/modules/mob/living/carbon/human/life/handle_regular_status_updates.dm
	deleted:    code/modules/mob/living/carbon/human/life/handle_virus_updates.dm
	modified:   code/modules/mob/living/carbon/human/update_icons.dm
	modified:   code/modules/mob/living/carbon/inventory.dm
	modified:   code/modules/mob/living/carbon/monkey/death.dm
	modified:   code/modules/mob/living/carbon/monkey/examine.dm
	modified:   code/modules/mob/living/carbon/monkey/inventory.dm
	modified:   code/modules/mob/living/carbon/monkey/life.dm
	modified:   code/modules/mob/living/carbon/monkey/monkey.dm
	modified:   code/modules/mob/living/carbon/monkey/update_icons.dm
	modified:   code/modules/mob/living/carbon/slime/life.dm
	modified:   code/modules/mob/living/carbon/species.dm
	modified:   code/modules/mob/living/damage_procs.dm
	modified:   code/modules/mob/living/death.dm
	modified:   code/modules/mob/living/living.dm
	modified:   code/modules/mob/living/living_defense.dm
	modified:   code/modules/mob/living/living_defines.dm
	modified:   code/modules/mob/living/say.dm
	modified:   code/modules/mob/living/silicon/ai/login.dm
	modified:   code/modules/mob/living/silicon/death.dm
	modified:   code/modules/mob/living/silicon/mommi/mommi_modules.dm
	modified:   code/modules/mob/living/silicon/robot/death.dm
	modified:   code/modules/mob/living/silicon/robot/robot.dm
	modified:   code/modules/mob/living/silicon/silicon.dm
	modified:   code/modules/mob/living/simple_animal/bees/bees_datums.dm
	modified:   code/modules/mob/living/simple_animal/bees/bees_mob.dm
	modified:   code/modules/mob/living/simple_animal/borer.dm
	modified:   code/modules/mob/living/simple_animal/borer/verbs_attached_arm.dm
	modified:   code/modules/mob/living/simple_animal/borer/verbs_attached_chest.dm
	modified:   code/modules/mob/living/simple_animal/borer/verbs_attached_head.dm
	modified:   code/modules/mob/living/simple_animal/borer/verbs_attached_leg.dm
	modified:   code/modules/mob/living/simple_animal/borer/verbs_detached.dm
	modified:   code/modules/mob/living/simple_animal/borer/verbs_severed.dm
	modified:   code/modules/mob/living/simple_animal/friendly/cat.dm
	modified:   code/modules/mob/living/simple_animal/friendly/mouse.dm
	modified:   code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	modified:   code/modules/mob/living/simple_animal/hostile/alien.dm
	modified:   code/modules/mob/living/simple_animal/hostile/human/skellington.dm
	modified:   code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
	modified:   code/modules/mob/living/simple_animal/simple_animal.dm
	modified:   code/modules/mob/mob.dm
	modified:   code/modules/mob/mob_defines.dm
	modified:   code/modules/mob/mob_helpers.dm
	modified:   code/modules/mob/new_player/new_player.dm
	modified:   code/modules/mob/new_player/sprite_accessories.dm
	modified:   code/modules/mob/say.dm
	modified:   code/modules/mob/transform_procs.dm
	modified:   code/modules/mob/update_icons.dm
	modified:   code/modules/nano/nanoui.dm
	modified:   code/modules/optics/photocollector.dm
	modified:   code/modules/organs/blood.dm
	modified:   code/modules/organs/organ_external.dm
	modified:   code/modules/paperwork/paperbin.dm
	modified:   code/modules/power/cable.dm
	modified:   code/modules/power/singularity/singularity.dm
	modified:   code/modules/power/turbine.dm
	modified:   code/modules/projectiles/gun.dm
	modified:   code/modules/projectiles/guns/projectile/constructable/gunsmithing.dm
	modified:   code/modules/projectiles/guns/projectile/constructable/railgun.dm
	modified:   code/modules/projectiles/guns/projectile/rocketlauncher.dm
	modified:   code/modules/projectiles/projectile.dm
	modified:   code/modules/projectiles/projectile/bullets.dm
	modified:   code/modules/projectiles/projectile/rocket.dm
	modified:   code/modules/projectiles/projectile/special.dm
	modified:   code/modules/randomMaps/vault_definitions.dm
	modified:   code/modules/reagents/Chemistry-Holder.dm
	modified:   code/modules/reagents/Chemistry-Reagents.dm
	modified:   code/modules/reagents/Chemistry-Recipes.dm
	modified:   code/modules/reagents/grenade_launcher.dm
	modified:   code/modules/reagents/machinery/chem_dispenser.dm
	modified:   code/modules/reagents/machinery/chem_master.dm
	modified:   code/modules/reagents/machinery/mortar.dm
	modified:   code/modules/reagents/machinery/pandemic.dm
	modified:   code/modules/reagents/machinery/thermometer.dm
	modified:   code/modules/reagents/reagent_containers/food/drinks.dm
	modified:   code/modules/reagents/reagent_containers/food/mobcube.dm
	modified:   code/modules/reagents/reagent_containers/food/snacks.dm
	modified:   code/modules/reagents/reagent_containers/food/snacks/grown.dm
	modified:   code/modules/reagents/reagent_containers/glass.dm
	modified:   code/modules/reagents/reagent_containers/glass/bottle.dm
	modified:   code/modules/reagents/reagent_containers/pill.dm
	modified:   code/modules/reagents/reagent_containers/spray.dm
	modified:   code/modules/reagents/reagent_containers/syringes.dm
	modified:   code/modules/research/designs/boards/computer_medical.dm
	modified:   code/modules/research/designs/boards/machine_command.dm
	modified:   code/modules/research/designs/medical.dm
	modified:   code/modules/research/designs/weapons.dm
	modified:   code/modules/research/mechanic/flatpack.dm
	modified:   code/modules/research/xenoarchaeology/artifact/artifact_autocloner.dm
	modified:   code/modules/research/xenoarchaeology/artifact/artifact_gigadrill.dm
	new file:   code/modules/research/xenoarchaeology/artifact/effects/unknown_effect_pathogen.dm
	modified:   code/modules/research/xenoarchaeology/finds/digsites.dm
	modified:   code/modules/research/xenoarchaeology/finds/finds.dm
	modified:   code/modules/research/xenoarchaeology/finds/finds_special.dm
	modified:   code/modules/research/xenoarchaeology/machinery/analysis_base.dm
	modified:   code/modules/research/xenoarchaeology/machinery/analysis_ion_mobility.dm
	modified:   code/modules/research/xenoarchaeology/machinery/analysis_isotope_ratio.dm
	modified:   code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
	modified:   code/modules/research/xenoarchaeology/misc.dm
	modified:   code/modules/spells/aoe_turf/blink.dm
	modified:   code/modules/spells/aoe_turf/charge.dm
	modified:   code/modules/spells/aoe_turf/conjure/arcane_golem.dm
	modified:   code/modules/spells/aoe_turf/conjure/doppelganger.dm
	modified:   code/modules/spells/aoe_turf/conjure/forcewall.dm
	modified:   code/modules/spells/aoe_turf/conjure/pontiac.dm
	modified:   code/modules/spells/aoe_turf/conjure/snakes.dm
	modified:   code/modules/spells/aoe_turf/disable_tech.dm
	modified:   code/modules/spells/aoe_turf/fall.dm
	modified:   code/modules/spells/aoe_turf/knock.dm
	modified:   code/modules/spells/aoe_turf/lightbulb.dm
	modified:   code/modules/spells/aoe_turf/smoke.dm
	modified:   code/modules/spells/general/area_teleport.dm
	modified:   code/modules/spells/general/lightning.dm
	modified:   code/modules/spells/general/reflect_pain.dm
	modified:   code/modules/spells/general/ring_of_fire.dm
	modified:   code/modules/spells/helpers.dm
	renamed:    code/modules/spells/no_clothes.dm -> code/modules/spells/passive/no_clothes.dm
	new file:   code/modules/spells/passive/passive.dm
	modified:   code/modules/spells/spell_code.dm
	modified:   code/modules/spells/targeted/buttbots_revenge.dm
	modified:   code/modules/spells/targeted/disease.dm
	modified:   code/modules/spells/targeted/disorient.dm
	modified:   code/modules/spells/targeted/equip/clowncurse.dm
	modified:   code/modules/spells/targeted/equip/frenchcurse.dm
	modified:   code/modules/spells/targeted/equip/horsemask.dm
	modified:   code/modules/spells/targeted/equip/robesummon.dm
	modified:   code/modules/spells/targeted/ethereal_jaunt.dm
	modified:   code/modules/spells/targeted/feint.dm
	modified:   code/modules/spells/targeted/fist.dm
	modified:   code/modules/spells/targeted/flesh_to_stone.dm
	modified:   code/modules/spells/targeted/genetic.dm
	modified:   code/modules/spells/targeted/grease.dm
	modified:   code/modules/spells/targeted/mind_transfer.dm
	modified:   code/modules/spells/targeted/projectile/fireball.dm
	modified:   code/modules/spells/targeted/projectile/firebreath.dm
	modified:   code/modules/spells/targeted/projectile/magic_missile.dm
	modified:   code/modules/spells/targeted/projectile/pie_throw.dm
	modified:   code/modules/spells/targeted/pumpkinhead.dm
	modified:   code/modules/spells/targeted/push.dm
	modified:   code/modules/spells/targeted/recall.dm
	new file:   code/modules/spells/targeted/retard.dm
	modified:   code/modules/spells/targeted/shoesnatch.dm
	modified:   code/modules/spells/targeted/targeted.dm
	modified:   code/modules/store/items.dm
	modified:   code/modules/surgery/generic.dm
	modified:   code/modules/surgery/headreattach.dm
	modified:   code/modules/surgery/surgery.dm
	modified:   code/modules/virus2/analyser.dm
	modified:   code/modules/virus2/antibodies.dm
	modified:   code/modules/virus2/centrifuge.dm
	modified:   code/modules/virus2/disease2.dm
	modified:   code/modules/virus2/diseasesplicer.dm
	modified:   code/modules/virus2/dishincubator.dm
	modified:   code/modules/virus2/effect/effect.dm
	modified:   code/modules/virus2/effect/stage_1.dm
	modified:   code/modules/virus2/effect/stage_2.dm
	modified:   code/modules/virus2/effect/stage_3.dm
	modified:   code/modules/virus2/effect/stage_4.dm
	modified:   code/modules/virus2/effect/stage_special.dm
	modified:   code/modules/virus2/helpers.dm
	new file:   code/modules/virus2/immune_system.dm
	modified:   code/modules/virus2/isolator.dm
	modified:   code/modules/virus2/items_devices.dm
	new file:   code/modules/virus2/pathogen_cloud.dm
	modified:   code/world.dm
	modified:   goon/code/datums/browserOutput.dm
	modified:   html/changelog.html
	modified:   html/changelogs/.all_changelog.yml
	modified:   icons/effects/96x96.dmi
	modified:   icons/effects/effects.dmi
	modified:   icons/logos.dmi
	modified:   icons/mob/animal.dmi
	modified:   icons/mob/clothing_accessories.dmi
	modified:   icons/mob/feet.dmi
	modified:   icons/mob/hud.dmi
	modified:   icons/mob/human.dmi
	modified:   icons/mob/human_face.dmi
	modified:   icons/mob/in-hand/left/clothing.dmi
	modified:   icons/mob/in-hand/left/memeballoon.dmi
	modified:   icons/mob/in-hand/right/clothing.dmi
	modified:   icons/mob/in-hand/right/memeballoon.dmi
	modified:   icons/mob/mob.dmi
	modified:   icons/mob/screen1.dmi
	modified:   icons/mob/species/grey/uniform.dmi
	modified:   icons/mob/species/vox/uniform.dmi
	modified:   icons/mob/uniform.dmi
	modified:   icons/mob/uniform_fat.dmi
	modified:   icons/obj/barsigns.dmi
	modified:   icons/obj/chemical.dmi
	modified:   icons/obj/closet.dmi
	modified:   icons/obj/clothing/accessories.dmi
	modified:   icons/obj/clothing/accessory_overlays.dmi
	modified:   icons/obj/clothing/shoes.dmi
	modified:   icons/obj/clothing/suits.dmi
	modified:   icons/obj/clothing/uniforms.dmi
	modified:   icons/obj/computer.dmi
	modified:   icons/obj/drinks.dmi
	modified:   icons/obj/food.dmi
	modified:   icons/obj/gun.dmi
	modified:   icons/obj/items.dmi
	modified:   icons/obj/library.dmi
	modified:   icons/obj/reagentfillings.dmi
	modified:   icons/obj/storage/smallboxes.dmi
	modified:   icons/obj/switchtool.dmi
	modified:   icons/obj/trash.dmi
	modified:   icons/obj/virology.dmi
	modified:   icons/obj/weapons.dmi
	modified:   icons/obj/weaponsmithing.dmi
	new file:   icons/pda_icons/spesspets_icons/spesspets_arrow_left.png
	new file:   icons/pda_icons/spesspets_icons/spesspets_arrow_right.png
	modified:   icons/role_HUD_icons.dmi
	modified:   icons/turf/areas.dmi
	new file:   icons/virology.dmi
	modified:   maps/RoidStation.dmm
	modified:   maps/_map.dm
	modified:   maps/bagelstation.dmm
	modified:   maps/defficiency.dmm
	modified:   maps/metaclub.dmm
	modified:   maps/packedstation.dmm
	new file:   maps/randomvaults/clownroid.dmm
	modified:   maps/randomvaults/ironchef.dmm
	modified:   maps/test_box.dmm
	modified:   maps/tgstation-sec.dmm
	modified:   maps/tgstation-snow.dmm
	modified:   maps/tgstation.dmm
	new file:   nano/css/instrument.css
	modified:   nano/templates/disease_splicer.tmpl
	new file:   nano/templates/instrument.tmpl
	modified:   nano/templates/portscrubber.tmpl
	new file:   sound/items/can_crushed.ogg
	new file:   sound/items/geiger_strong.ogg
	new file:   sound/machines/airlock_beep.ogg
	modified:   vgstation13.dme
 2019-07-11 05:25:48 -05:00
DeityLink
2d28007c77 Virology Rewrite/Virus3/Nu-viro: IT'S FINALLY HERE (#23461) 
* Virology Rewrite/Virus3 - Part 2.5 of 3 : Rebase to Bleeding-Edge (#23391)

* Virology Rewrite/Virus3 - Part 1 of 3 : pathogen spread, science goggles (#22036)

* blud

* cloud

* clooooud

* spread

* scanner

* I am the god of hellfire

* oh god oh no

* trimming fat

* dsqdsqdqs

* sdqdqsdqs

* derp

* pinky & the brain

* gibs n meats

* fix

* FeetStab

* working

* overload

* recipes

* analyser sprites

* analyser

* fucktheflu

* cures

* scanner

* scanner data

* work

* incubator

* more incubator stuff

* all of the centrifuge

* some splicer stuff

* more stuff

* lab mouse and cage

* way too much shit

* rr

* duh

* travis u havin a stroke?

* dangerousness

* better spacing

* some fixes

* qdel

* virus and immune system transfer

* derp

* pixels

* fixing retardation

* srccccccccc

* geh

* ahh

* sterility scan

* however

* out of

* conflicted dmi fixes

* what's wrong with you git

* aight travis now get your shit together.

* ffff

* hurr durr

* setting up

* oh shit nigga why have I not commit any of this yet

* ugh

* curb your pathogens

* bleh

* eh

* runtime

* sterilizine buff

* fixes

* sterile

* fixes

* gibbbb

* gneh

* eh

* oh that too

* fixing mouse refactor

* lab mice packs

* oh god oh fuck here we go

* fucking pandemic circuitboard

* chew

* ERT

* step on it travis

* get on with it

* fixing disease touch not really though

* what's your problem byond

* o minus

* syntax error

Co-Authored-By: DamianX <DamianX@users.noreply.github.com>

* spelling error

Co-Authored-By: DamianX <DamianX@users.noreply.github.com>

* still that spelling error

Co-Authored-By: DamianX <DamianX@users.noreply.github.com>

* boy am I bad at english

Co-Authored-By: DamianX <DamianX@users.noreply.github.com>

* I mean just look at that

Co-Authored-By: DamianX <DamianX@users.noreply.github.com>

* manual tweak and record

* oxford comma or something

Co-Authored-By: DamianX <DamianX@users.noreply.github.com>

* TRAsen

Co-Authored-By: DamianX <DamianX@users.noreply.github.com>

* wrong proc

* weird process

* chem chem chem

* mouse balance

* defines
 2019-07-09 21:01:45 +02:00
boy2mantwicethefam
8124d42cb1 This was accidentally removed 2019-07-01 19:35:25 +03:00
boy2mantwicethefam
b052bcb088 Revert "Revert "Changes"" 
This reverts commit 78bad47efa.
 2019-07-01 19:28:19 +03:00
boy2mantwicethefam
d74eea5d0c Merge branch 'Bleeding-Edge' into spells 2019-07-01 19:16:01 +03:00
boy2mantwicethefam
78bad47efa Revert "Changes" 
This reverts commit 1aa16d6960.
 2019-07-01 19:15:15 +03:00
boy2mantwicethefam
1aa16d6960 Changes 2019-07-01 19:13:42 +03:00
Your Name
d14510e1b7 return of brain damage 2019-06-23 04:38:18 +02:00
GlassEclipse
42be10c9b4 modified: code/defines/obj.dm 
modified:   code/game/objects/items/weapons/grenades/chronogrenade.dm
	modified:   code/modules/spells/aoe_turf/fall.dm
 2019-06-13 05:02:09 -05:00
GlassEclipse
3f6f3c9492 modified: code/datums/gamemode/role/cultist.dm 
modified:   code/modules/reagents/reagent_containers/food/snacks.dm
	modified:   code/modules/spells/aoe_turf/aoe_turf.dm
	modified:   icons/obj/storage/smallboxes.dmi
	modified:   vgstation13.dme
 2019-06-12 22:17:56 -05:00
GlassEclipse
d2a274e07d modified: code/datums/disease.dm 
deleted:    code/datums/diseases/japanesefever.dm
	deleted:    code/datums/gamemode/factions/bloodcult/Rework Check.txt
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult.dm
	deleted:    code/datums/gamemode/factions/bloodcult/bloodcult_data.dm
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult_items.dm
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult_runes.dm
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult_runespells.dm
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult_spells.dm
	new file:   code/datums/gamemode/factions/bloodcult/bloodcult_words.dm
	deleted:    code/datums/gamemode/factions/bloodcult/friendlycult/friendlycult_runes.dm
	deleted:    code/datums/gamemode/factions/bloodcult/friendlycult/friendlycult_runespells.dm
	deleted:    code/datums/gamemode/factions/bloodcult/friendlycult/friendlycult_spells.dm
	deleted:    code/datums/gamemode/factions/bloodcult/friendlycult/friendlycult_words.dm
	modified:   code/defines/obj.dm
	modified:   code/game/objects/items/robot/robot_upgrades.dm
	modified:   code/game/objects/items/toys.dm
	modified:   code/game/objects/items/weapons/grenades/chronogrenade.dm
	modified:   code/game/objects/items/weapons/storage/boxes.dm
	modified:   code/game/objects/structures/vehicles/lightcycle.dm
	modified:   code/modules/mob/living/silicon/ai/login.dm
	modified:   code/modules/mob/living/silicon/robot/robot_modules.dm
	modified:   code/modules/mob/living/silicon/silicon.dm
	modified:   code/modules/paperwork/paper.dm
	modified:   code/modules/reagents/Chemistry-Reagents.dm
	modified:   code/modules/reagents/reagent_containers/glass/bottle.dm
	modified:   code/modules/reagents/reagent_containers/syringes.dm
	modified:   code/modules/spells/aoe_turf/fall.dm
	modified:   code/world.dm
	modified:   icons/obj/storage/smallboxes.dmi
 2019-06-12 22:10:09 -05:00
GlassEclipse
aa4ba969c4 Merge https://github.com/vgstation-coders/vgstation13 into glasseclipse-branch 2019-06-12 21:57:17 -05:00
GlassEclipse
7d886a1ffd new file: code/datums/gamemode/factions/bloodcult/Rework Check.txt 
modified:   code/datums/gamemode/factions/bloodcult/bloodcult.dm
	new file:   code/datums/gamemode/factions/bloodcult/bloodcult_data.dm
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult_items.dm
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult_runes.dm
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult_spells.dm
	deleted:    code/datums/gamemode/factions/bloodcult/bloodcult_words.dm
	modified:   code/datums/gamemode/factions/bloodcult/friendlycult/friendlycult_spells.dm
	modified:   code/datums/gamemode/factions/bloodcult/friendlycult/friendlycult_words.dm
	modified:   code/game/objects/items/robot/robot_upgrades.dm
	modified:   code/modules/mob/living/silicon/robot/robot_modules.dm
	modified:   code/modules/reagents/reagent_containers/food/snacks.dm
	modified:   code/modules/spells/spell_code.dm
 2019-06-08 00:16:44 -05:00
GlassEclipse
33df798249 modified: code/game/objects/items/weapons/grenades/chronogrenade.dm 
modified:   code/modules/spells/aoe_turf/fall.dm
 2019-06-07 18:26:16 -05:00
Thomas Symalla
0bffd688df Merge https://github.com/vgstation-coders/vgstation13 into glasseclipse-branch 
modified:   code/ATMOSPHERICS/atmospherics.dm
	modified:   code/ATMOSPHERICS/components/trinary_devices/t_valve.dm
	modified:   code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm
	modified:   code/WorkInProgress/Ported/policetape.dm
	modified:   code/WorkInProgress/pomf/spacepods/actions.dm
	modified:   code/WorkInProgress/pomf/spacepods/equipment.dm
	modified:   code/WorkInProgress/pomf/spacepods/spacepods.dm
	modified:   code/_onclick/hud/mommi.dm
	modified:   code/_onclick/hud/robot.dm
	modified:   code/controllers/subsystem/init/more_init_stuff.dm
	modified:   code/controllers/subsystem/init/persistence_map.dm
	modified:   code/datums/gamemode/dynamic/dynamic_rulesets_midround.dm
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult.dm
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult_buildings.dm
	modified:   code/datums/gamemode/factions/bloodcult/bloodcult_flavourlines.dm
	modified:   code/datums/mind.dm
	modified:   code/datums/uplink_item.dm
	modified:   code/game/gamemodes/wizard/rightandwrong.dm
	modified:   code/game/machinery/alarm.dm
	modified:   code/game/machinery/atmo_control.dm
	modified:   code/game/machinery/computer/ai_core.dm
	modified:   code/game/machinery/computer/atmos_control.dm
	modified:   code/game/machinery/computer/cargo.dm
	modified:   code/game/machinery/computer/communications.dm
	modified:   code/game/machinery/computer/shuttle_computers.dm
	modified:   code/game/machinery/doors/poddoor.dm
	modified:   code/game/machinery/machinery.dm
	modified:   code/game/machinery/rechargestation.dm
	modified:   code/game/machinery/washing_machine.dm
	modified:   code/game/objects/items/devices/PDA/PDA.dm
	modified:   code/game/objects/items/weapons/implants/implantcase.dm
	modified:   code/game/objects/items/weapons/kitchen.dm
	modified:   code/game/objects/items/weapons/storage/boxes.dm
	modified:   code/game/objects/objs.dm
	modified:   code/game/objects/structures/crates_lockers/closets/coffin.dm
	modified:   code/game/objects/structures/crates_lockers/closets/secure/security.dm
	modified:   code/game/objects/structures/safe.dm
	modified:   code/game/objects/structures/stool_bed_chair_nest/rollerbed.dm
	modified:   code/game/objects/structures/tables_racks.dm
	modified:   code/game/turfs/simulated/floor.dm
	modified:   code/modules/Economy/EFTPOS.dm
	modified:   code/modules/admin/topic.dm
	modified:   code/modules/admin/verbs/diagnostics.dm
	modified:   code/modules/bomberman/bomberman.dm
	modified:   code/modules/clothing/clothing.dm
	modified:   code/modules/clothing/glasses/glasses.dm
	modified:   code/modules/customitems/item_spawning.dm
	modified:   code/modules/detectivework/detective_work.dm
	modified:   code/modules/events/event_dynamic.dm
	modified:   code/modules/food/cooking_machines.dm
	modified:   code/modules/media/jukebox.dm
	modified:   code/modules/medical/computer/cloning.dm
	modified:   code/modules/mining/ores_coins.dm
	modified:   code/modules/mob/dead/observer/observer.dm
	modified:   code/modules/mob/emote.dm
	modified:   code/modules/mob/living/carbon/alien/alien.dm
	modified:   code/modules/mob/living/carbon/slime/life.dm
	modified:   code/modules/mob/living/living.dm
	modified:   code/modules/mob/living/silicon/ai/ai.dm
	modified:   code/modules/mob/living/silicon/robot/robot_modules.dm
	modified:   code/modules/mob/living/silicon/state_laws.dm
	modified:   code/modules/mob/living/simple_animal/friendly/corgi.dm
	modified:   code/modules/mob/mob_movement.dm
	modified:   code/modules/power/generator.dm
	modified:   code/modules/projectiles/ammunition/magazines.dm
	modified:   code/modules/projectiles/guns/energy/special.dm
	modified:   code/modules/projectiles/guns/projectile/automatic.dm
	modified:   code/modules/reagents/reagent_dispenser.dm
	modified:   code/modules/research/rdmachines.dm
	modified:   code/modules/scripting/Interpreter/Interpreter.dm
	deleted:    code/modules/spells/targeted/retard.dm
	modified:   code/modules/spells/targeted/targeted.dm
	modified:   code/modules/surgery/genderchange.dm
	modified:   code/modules/virus2/antibodies.dm
	modified:   code/modules/virus2/effect/stage_3.dm
	modified:   goon/code/obj/machinery/bot/chefbot.dm
	modified:   html/changelogs/Pomf123.yml
	modified:   icons/mob/in-hand/left/guninhands_left.dmi
	modified:   icons/mob/in-hand/right/guninhands_right.dmi
	modified:   icons/obj/ammo.dmi
	modified:   icons/obj/gun.dmi
	modified:   maps/RoidStation.dmm
	modified:   nano/templates/comm_console.tmpl
 2019-06-05 21:15:33 -05:00
Thomas Symalla
7a3a1939a2 Merge branch 'glasseclipse-branch' of https://github.com/GlassEclipse/vgstation13 into glasseclipse-branch 
modified:   code/modules/spells/aoe_turf/fall.dm
 2019-06-05 18:51:56 -05:00
Thomas Symalla
7d715cf25b modified: __DEFINES/reagents.dm 
modified:   code/datums/black_market_item.dm
	modified:   code/datums/disease.dm
	modified:   code/datums/diseases/japanesefever.dm
	modified:   code/defines/obj.dm
	modified:   code/game/objects/items/devices/illegalradio.dm
	modified:   code/game/objects/items/toys.dm
	modified:   code/game/objects/items/trader.dm
	modified:   code/game/objects/items/weapons/grenades/chronogrenade.dm
	modified:   code/game/objects/items/weapons/storage/boxes.dm
	modified:   code/modules/mob/living/carbon/human/say.dm
	modified:   code/modules/paperwork/paper.dm
	modified:   code/modules/reagents/Chemistry-Reagents.dm
	modified:   code/modules/reagents/reagent_containers/glass/bottle.dm
	modified:   code/modules/spells/aoe_turf/aoe_turf.dm
	modified:   code/modules/spells/aoe_turf/fall.dm
	modified:   icons/obj/radio.dmi
	modified:   icons/obj/storage/smallboxes.dmi
 2019-06-05 18:49:06 -05:00
GlassEclipse
2f3d99cc5a modified: code/datums/gamemode/factions/bloodcult/bloodcult_items.dm 
new file:   code/datums/gamemode/factions/bloodcult/friendlycult/friendlycult_runes.dm
	new file:   code/datums/gamemode/factions/bloodcult/friendlycult/friendlycult_runespells.dm
	new file:   code/datums/gamemode/factions/bloodcult/friendlycult/friendlycult_spells.dm
	new file:   code/datums/gamemode/factions/bloodcult/friendlycult/friendlycult_words.dm
	modified:   code/game/objects/items/robot/robot_upgrades.dm
	modified:   code/modules/mob/living/silicon/silicon.dm
	modified:   code/modules/reagents/reagent_containers/syringes.dm
 2019-06-05 18:37:57 -05:00
Damian
041b0b6f67 Reduced juggernaut dash max distance to 4 2019-06-05 16:50:52 +02:00
D3athrow
3defc593e1 Revert "Adds the brain damage spell for Wizards. (#21229)" 
This reverts commit 0a908f5d28.

# Conflicts:
#	code/modules/spells/targeted/retard.dm
#	icons/mob/screen_spells.dmi
 2019-06-04 17:05:59 -05:00
GlassEclipse
01b9bf4462 Merge branch 'glasseclipse-temp' into glasseclipse-branch 
modified:   code/datums/black_market_item.dm
	modified:   code/datums/diseases/japanesefever.dm
	modified:   code/game/objects/items/weapons/grenades/chronogrenade.dm
	modified:   code/modules/spells/aoe_turf/aoe_turf.dm
	modified:   code/modules/spells/aoe_turf/fall.dm
 2019-06-04 14:43:06 -05:00
GlassEclipse
2299d44641 modified: code/datums/black_market_item.dm 
new file:   code/datums/diseases/japanesefever.dm
	modified:   code/game/objects/items/weapons/grenades/chronogrenade.dm
	modified:   code/modules/spells/aoe_turf/aoe_turf.dm
	modified:   code/modules/spells/aoe_turf/fall.dm
 2019-06-04 14:05:39 -05:00
GlassEclipse
91fbe59cab modified: code/modules/spells/aoe_turf/fall.dm 2019-06-04 13:04:08 -05:00