cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
23,468 Commits 73 Branches 18 Tags
01d2471fc99d186b70213110428cc3a9f3489b5b
Commit Graph

63 Commits

Author SHA1 Message Date
D3athrow
01d2471fc9 Merge branch 'color_replace_2_electric_boogaloo' into Bleeding-Edge 
Conflicts:
	code/ATMOSPHERICS/pipe/pipe_dispenser.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/embedded_controller/embedded_controller_base.dm
	code/modules/mining/money_bag.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/silicon/mommi/mommi.dm
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
	code/modules/research/destructive_analyzer.dm
	code/modules/research/rdconsole.dm
	code/modules/research/xenoarchaeology/machinery/analysis_base.dm
	code/modules/research/xenoarchaeology/machinery/artifact_harvester.dm
	code/modules/research/xenoarchaeology/tools/ano_device_battery.dm
 2015-04-12 16:40:59 -05:00
D3athrow
277566f3ff runtime avoidance 2015-02-20 23:49:42 -06:00
DeityLink
30d7764cb9 All of NewCult 2015-02-20 20:53:58 +01:00
D3athrow
391170bd39 more qdel so far 2015-02-02 01:57:27 -06:00
D3athrow
fe2c7e5a58 gc hud images softly 2015-02-01 23:31:45 -06:00
D3athrow
8e7191600c Readd the ability to stack runes while adding a slightly proper fix to the astral journey rune. 2015-01-27 23:21:21 -06:00
clusterfack
809e2e924d Fixes #2568, runes cannot stack on tiles now. Fixes #2646, remove cultspawn variable which is likely causing issues.Fixes #2322, wrenchanchor is modified to work properly with freezers/heaters. Fixes #2459, adds the datum holding reagents to my_atom before transfer. Fixes #1625, you can now clean of space mold with soap. Fixes #2363, chemmasters now have actual upgrades and will spawn with proper basic energy. Fixes #2548, ghosts cannot activate suspension field generators. 2015-01-27 17:28:11 -06:00
ririchiyo
2c69c0dc15 There's no way this done yet. 2015-01-12 08:45:52 -05:00
Rob Nelson
c63631efe2 Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into fix-cult 
Conflicts:
	code/game/gamemodes/cult/runes.dm
 2014-12-18 12:29:49 -08:00
Rob Nelson
d089bb14f4 Cult can now spam, but they won't chant until all 9 are present. 2014-12-18 12:27:34 -08:00
clusterfack
0386cec6ba Getting Rid of cultspawn in runes too 2014-12-18 08:16:59 -06:00
Rob Nelson
034409ec6e Fix cult summon spam. 2014-12-17 12:29:59 -08:00
Rob Nelson
bf90cf2a72 Supermatter cascade survivability fixes, plus changes. 2014-12-09 20:32:03 -08:00
DeityLink
ff329a29ee Merge remote-tracking branch 'origin/Bleeding-Edge' into adminbus-final 2014-11-25 04:03:35 +01:00
Chris
fb194e52e4 For some reason we were looping through the entire world to find runes in many situations. Added a global list for runes that are added to on creation, and removed upon destruction. 2014-11-23 11:54:35 -06:00
DeityLink
5684a34a6c Adminbus fixing part 1 2014-11-23 16:19:23 +01:00
DeityLink
77d1abd7aa adding parens 2014-11-09 23:49:26 +01:00
DeityLink
bb3e311f35 preventing people from converting the sacrifice objective 2014-11-08 17:58:27 +01:00
DeityLink
7c417e6b8d sacrifice-rune-rework 2014-11-08 16:25:24 +01:00
DeityLink
ed02be9f0d null rod buffs part 2 2014-11-03 04:14:08 +01:00
DeityLink
8c6b896791 improved swapping list, added see_narsie checks in mob.dm, and put a few sanity checks 2014-10-28 07:18:39 +01:00
DeityLink
7e2bac639f Added animation for Summon Cultist rune and rescaled self-damage 
Because cultists shouldn't send themselves in crit with a
freedom+cultsummon combo
 2014-10-27 21:13:36 +01:00
DeityLink
6db2c97193 The Teleport Other rune now properly swaps the un-anchored atoms on both runes 
Previously it would only send the atoms from the used rune to the other
rune.
 2014-10-27 20:40:41 +01:00
DeityLink
705d4aac8c fixing Teleport talismans not working 2014-10-27 20:24:37 +01:00
DeityLink
4a6b7e2b63 replacing a hundrer of /red with <span class='warning'> 2014-10-27 18:40:26 +01:00
DeityLink
8b2987ca74 harvester work and remaining stuff 
I...I think everything's done now....
 2014-10-25 15:09:33 +02:00
DeityLink
fdde481195 cultify() everything! (only obj and turf actually) 
I don't think adding cultify to mobs is necessary since it's more a
matter of "are they cultists or not" and "are they constructs or not"?
The only exceptions are the hostile creatures that roam in hell.
 2014-10-24 17:02:40 +02:00
DeityLink
e17b0624af sigh 2014-10-23 16:07:48 +02:00
DeityLink
9ed43e8263 . 2014-10-20 14:30:28 +02:00
DeityLink
01f5296aff stuff 2014-10-20 11:11:41 +02:00
DeityLink
edaa7dd4e8 some cult stuff, also loophole fix 2014-10-14 08:34:19 +02:00
ririchiyo
7cc6dae487 This is a cursory glace through the files and dealing with some conflicts. 2014-09-27 18:05:34 -04:00
Cutelilduck
9211f56fbb Teleport Self talismans were trying to add to an 'info' field that does exist. So teleport self talismans were being created invisible and unusable. Removed the T.info lines, removed two unused runewords in the Create Talisman starting paper, and made usable creating a teleport talisman from the starting paper. It used to use a pick( command that didn't work. 
tldr; Teleport self scrolls now work.
 2014-09-20 04:41:22 -05:00
DeityLink
153e274e6b Fixed the phrase spoken when using the Cult Armor rune, also updated a few comments 
Up until now using the "Cult Armor" rune would spout the same phrase as
"Summon Tome". The correct phrase is written on the talisman that
cultists get at roundstart.

A minor fix really, but muh immersion, muh lore, etc
 2014-09-06 15:47:46 +09:00
Rob Nelson
a36e783f3b FIIIIIIRE rework, nano paper cleanup. 2014-08-20 20:11:58 -07:00
Rob Nelson
42421a106b Narsie bugfix. 2014-08-15 15:52:45 -07:00
VelardAmakar
97731a628f Fixed typo in usage of 'sinister' class. 2014-04-08 11:37:04 -04:00
VelardAmakar
9be6efc5e7 Added sinister class to stylesheet.dm for cult, Happiest Mask, and other spooky things. 
(it's dark purple, bolded and italicized)
 2014-04-04 13:43:42 -04:00
Rob Nelson
c815e94973 Standardize HULK. 2014-01-21 13:51:44 -08:00
d3athrow
0f4387b670 Adds logging for conversion and deconversion for rev and cult 2013-09-14 23:45:45 -05:00
Rob Nelson
732883020e Fix issues with cult. 2013-09-11 17:48:30 -07:00
Chinsky
e40140be03 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm
 2013-06-08 05:55:42 +04:00
Ravensdale
c8f9864207 Fix: Engineering borg's 'Antique' sprite being invisible. Blasted caps. 
New: Rowtree's 'Lucy' Cyborg and Serithi's 'REMNANT' AI Core sprites implemented.

Tweak: Cult's conversion rune failure text tweaked so something a little more immersive.
 2013-06-03 13:32:44 -07:00
Furlucis
0f9a1fe71c Fixes and a few tweaks to Obscure, Seer, and Reveal runes. 
Signed-off-by: Furlucis <Logman115@gmail.com>
 2013-05-31 19:42:27 -04:00
Spamcat
b605fe84db Fixed #2706. 2013-04-27 14:37:10 +04:00
Cael_Aislinn
8581932c57 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/game/objects/items/toys.dm
	icons/mob/back.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/uniforms.dmi
	icons/obj/weapons.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-14 22:14:46 +10:00
Cael_Aislinn
bdeb96b7e5 Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/__HELPERS/game.dm
	code/controllers/shuttle_controller.dm
	code/datums/datumvars.dm
	code/datums/supplypacks.dm
	code/defines/obj/storage.dm
	code/defines/obj/vending.dm
	code/defines/obj/weapon.dm
	code/defines/procs/command_alert.dm
	code/game/area/Space Station 13 areas.dm
	code/game/atoms.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/dust.dm
	code/game/gamemodes/events/miniblob.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/factions.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/jobs/access.dm
	code/game/jobs/job/assistant.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/engineering.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/jobs/job_controller.dm
	code/game/machinery/alarm.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/computer/HolodeckControl.dm
	code/game/machinery/computer/ai_core.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/card.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/message.dm
	code/game/machinery/computer/pod.dm
	code/game/machinery/computer/prisoner.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/constructable_frame.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/recharger.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/logbrowser.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/machinery/teleporter.dm
	code/game/machinery/wishgranter.dm
	code/game/mecha/mech_fabricator.dm
	code/game/mecha/working/ripley.dm
	code/game/objects/items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/objects/items/devices/radio/encryptionkey.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/stacks/medical.dm
	code/game/objects/items/weapons/cards_ids.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/hydroponics.dm
	code/game/objects/items/weapons/manuals.dm
	code/game/objects/items/weapons/secstorage/secstorage.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/storage/firstaid.dm
	code/game/objects/items/weapons/storage/kit.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/surgery_tools.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
	code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/electricchair.dm
	code/game/objects/structures/extinguisher.dm
	code/game/objects/structures/watercloset.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/game/vehicles/airtight/airtight.dm
	code/game/vehicles/vehicle.dm
	code/global.dm
	code/modules/DetectiveWork/evidence.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/diagnostics.dm
	code/modules/admin/verbs/getlogs.dm
	code/modules/client/preferences.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/critters/critter_defenses.dm
	code/modules/detectivework/scanner.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/food/recipes_microwave.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.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/silicon/ai/life.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_transformation_simple.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paperbin.dm
	code/modules/paperwork/pen.dm
	code/modules/power/cable.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile/revolver.dm
	code/modules/projectiles/projectile/change.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	code/modules/recycling/sortingmachinery.dm
	code/modules/research/designs.dm
	config/config.txt
	html/changelog.html
	icons/mob/head.dmi
	icons/mob/hud.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	icons/obj/grenade.dmi
	icons/obj/projectiles.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-11 22:12:31 +10:00
Chinsky
4f173c52a8 Good God, cult code is atrocious.... 
For now made all words into one list, instead of separate vars for each.
Brought back awesome Urist runes. Down with crayon doodles!

Need to look into making rune NOT check what rune it is EVERY TIME it is activated... making subclasses or some shit like that.
The more I stare in that code the louder screams in my head, maybe that's intended?
 2013-01-11 02:01:23 +04:00
Cael_Aislinn
aae42d928a Merge branch 'incremental_tg' r5200 into bs12_with_tgport 
Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/__HELPERS/type2type.dm
	code/__HELPERS/unsorted.dm
	code/datums/datumvars.dm
	code/datums/disease.dm
	code/datums/organs/organ_external.dm
	code/datums/supplypacks.dm
	code/defines/obj.dm
	code/game/area/areas.dm
	code/game/atoms.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/hud.dm
	code/game/jobs/access.dm
	code/game/jobs/job/civilian.dm
	code/game/machinery/alarm.dm
	code/game/machinery/cloning.dm
	code/game/machinery/computer/cloning.dm
	code/game/machinery/computer/medical.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/objects/effects/decals/contraband.dm
	code/game/objects/effects/signs.dm
	code/game/objects/items/devices/PDA/PDA.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/game/objects/items/weapons/photography.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/window.dm
	code/game/sound.dm
	code/game/verbs/ooc.dm
	code/global.dm
	code/modules/DetectiveWork/detective_work.dm
	code/modules/DetectiveWork/evidence.dm
	code/modules/DetectiveWork/footprints_and_rag.dm
	code/modules/DetectiveWork/scanner.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/verbs/adminhelp.dm
	code/modules/admin/verbs/adminpm.dm
	code/modules/awaymissions/gateway.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/client/preferences.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/mint.dm
	code/modules/mining/ores_coins.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/living/carbon/alien/alien.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.dm
	code/modules/mob/living/carbon/human/human_damage.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/say.dm
	code/modules/mob/mob.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_transformation_simple.dm
	code/modules/mob/new_player/login.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/mob/new_player/savefile.dm
	code/modules/mob/new_player/sprite_accessories.dm
	code/modules/paperwork/folders.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/photocopier.dm
	code/modules/projectiles/guns/energy/special.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/setup.dm
	code/unused/mining/datum_processing_recipe.dm
	code/unused/powerarmor/powerarmor.dm
	code/world.dm
	html/changelog.html
	icons/effects/96x96.dmi
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/hydroponics.dmi
	icons/obj/items.dmi
	icons/turf/areas.dmi
	icons/turf/walls.dmi
	maps/RandomZLevels/fileList.txt
	maps/RandomZLevels/spacebattle.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-01-07 00:23:22 +10:00
giacomand@gmail.com
7b3ca4e0d9 Reverted r5355. 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5357 316c924e-a436-60f5-8080-3fe189b3f50e
 2012-12-18 23:51:10 +00:00