Commit Graph
96 Commits
Author SHA1 Message Date
Enzo-Leon f5cc531bb9 Feedback adjustments for improved sentence structue. 2023-10-02 12:27:31 -07:00
Enzo-Leon f13f395db7 Altevian Adjustments - Descriptions & Small Tweaks 2023-10-02 11:40:19 -07:00
Heroman 9a94306585 Refactors tool typechecks, refactors transforming tools, makes Altevian wrench into one 2023-10-01 09:34:43 +10:00
Killian 1c1e60c60a Update shock_maul.dm 2023-04-14 09:22:58 +01:00
Killian 3ac69a355c Update shock_maul.dm
move AP handling as well just to be safe
2023-04-10 13:39:21 +01:00
Killian 6d026020d7 Update shock_maul.dm 2023-04-10 13:27:17 +01:00
Killian 222f679dae concussion maul pt4 2023-04-10 13:24:17 +01:00
Killian f1c168faa2 concussion maul pt3 2023-04-10 07:53:15 +01:00
Killian 5c1bdee75e Update shock_maul.dm
message cleanup
2023-04-10 01:45:39 +01:00
Killian 6105365066 concussion maul pt2 2023-04-10 01:25:03 +01:00
Killian ad53fd8f6f concussion maul 2023-04-08 09:24:45 +01:00
Killian d85d9306df melee weapon info on examine 2023-03-12 03:12:21 +00:00
Heroman 10596cfb1b Adds a ton mroe altevian stuff 2022-09-21 14:59:26 +10:00
NovacatandGitHub 1aa4c73e8d Revert "[MIRROR] /atom New() => Initialize() [MDB IGNORE]" 2022-08-27 08:49:56 -04:00
MistakeNot4892 d717a4b50a Merge branch 'master' of https://github.com/VOREStation/VOREStation into upstream-merge-8298 2022-08-25 14:26:20 +10:00
PoojawaandGitHub 2f41233382 get_random_colour() now prepends a # (#13423)
* get_random_colour() now prepends a #

* Sleepy edits bad.
2022-07-31 14:09:00 -04:00
MistakeNot4892andVirgoBot 3f9af78f3a /atom New() => Initialize() [MDB IGNORE] 2021-11-14 03:09:51 -05:00
MistakeNot4892andAronai Sieyes 0cea9c35a6 Remove suicide act 2021-10-27 20:35:12 -04:00
Ghost ActualandGitHub 0085a5bd10 Adds more clothing from Polaris and various sources (#11546)
* Base Commit

* Secondary Commit

* Small Addition

* Small Fix

* Yet another Commit

* small fix

* Small Fix

* Small Addition

* More Commit

* I don't know how to stop

* ushanka

* Small Fix

* *aaaaaaa*

* another add-on

* Small Fix

* Revert "Small Fix"

This reverts commit e674b81a0ddee893c6aa2dcdb92040040677351a.

* Conflict Fixes

* Revert "Conflict Fixes"

This reverts commit 1af644bdcab78018aa73525125b32e522d08db41.

* Conflict Fix 2
2021-09-27 14:31:10 -04:00
577b986ba6 Convert some bools to TRUE/FALSE instead of 1/0. (#11100)
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
2021-07-16 13:43:25 -04:00
Aronai Sieyes 0da0c54388 Convert almost all alert() to tgui_alert() 2021-06-25 17:03:35 -04:00
Aronai Sieyes 70bff20384 Normalize alert() calls 2021-06-25 14:27:14 -04:00
NeertiandVirgoBot 767e655310 Linter Introduction + Cleanup 2021-05-25 23:19:34 -04:00
David Winters 853ed259bf Update misc_vr.dm 2021-04-12 13:12:20 -04:00
David Winters be762a81ed [DNM] holster stuff, doesn't work yet 2021-04-03 22:25:03 -04:00
MechoidandVirgoBot 40a4602d4b Adds a Whip. 2020-12-27 20:56:54 -05:00
Rykka d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
Aronai Sieyes 09074eaabb Alter playsound paradigm 2020-05-18 23:42:15 -04:00
Aronai SieyesandVirgoBot 6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
SchnayyandVirgoBot 67aff4cb42 sprite fixes (#6863) 2020-03-19 00:18:43 -04:00
Unknown f42cd78de3 Fixes Elven Weapons 2019-12-06 19:14:35 -05:00
Unknown 192dd12e7f Attempts to fix Gladius 2019-12-06 18:59:35 -05:00
Unknown d8392dfe8b More updates 2019-12-06 18:24:18 -05:00
Unknown 5499e3272f Miscellaneous fixes
- Fixes holodeck eswords
- Fixes toy swords not showing the blade
- Temporarily disables vent sounds

Fixes #6265
2019-12-06 17:10:13 -05:00
MechoidandVirgoBot 99bc3dcdbc Security / PseudoCargo Expansion 2019-11-24 17:23:48 -05:00
lolman360andVirgoBot ae859c49e9 [READY] Recolourable energy weapons. (#6507) 2019-11-01 12:38:06 -04:00
MechoidandVirgoBot ae48659a68 Exploration Expansion 1: Or, How I Learned To Love The Tree 2019-08-21 17:23:07 -04:00
MechoidandVirgoBot 595cdeb7b5 THIS PR IS 7+ DAYS OLD, SEE #6203 . Energy-Swords and Changeling Melee Weapons Can Deflect Projectiles (#6215)
* MakeMeleeGreatAgain

* Where is melee defined?!
2019-06-18 05:51:23 -04:00
NeertiandVirgoBot 94e6cc402b Merge pull request #6027 from Mechoid/Precursotech_Sword
Anomalotech Charge Sword
2019-04-14 01:21:05 -04:00
NeertiandNovacat 30b967e28a Items are now assumed to be conductive, rather than the opposite 2019-03-28 21:45:38 -04:00
NeertiandNovacat 86174593bf Replaces GoonPS scheduled_tasks and obj processing with SMC processing subsystems and timer 2019-03-26 23:58:26 -04:00
AtermoneraandVirgoBot 2df5e9fe0e Merges AI Branch into Master 2018-12-01 00:06:38 -05:00
Leshana b5cf8383f6 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into vplk-sync-2018-04-14
# Conflicts:
#	code/game/machinery/jukebox.dm
#	code/modules/economy/lorenews.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
2018-04-15 14:19:36 -04:00
Neerti 4ac6d34235 Adds Tile-based Attacks
Adds ability to attack mobs by clicking their tile.
When someone clicks a tile with a weapon while off help intent, and if a mob is occupying that tile, the mob will be attacked as if they were clicked directly.
If more than one mob is on a tile, one is chosen randomly.
You cannot hit yourself by clicking your own tile.
Weapons with cleaving abilities will attempt a cleave on the tile clicked on, making it very easy to hit (simple) mobs with those weapons if near you.

Other changes.
Cleave proc can accept any atom now and not just a mob.
Also cleans up weapons deciding how they can cleave somewhat.
2018-04-05 13:28:05 -04:00
Leshana 6756c5a483 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-03-30
# Conflicts:
#	.travis.yml
#	code/ATMOSPHERICS/components/unary/outlet_injector.dm
#	code/__defines/_planes+layers.dm
#	code/__defines/chemistry.dm
#	code/__defines/mobs.dm
#	code/_helpers/mobs.dm
#	code/_onclick/hud/robot.dm
#	code/game/area/areas.dm
#	code/game/machinery/computer/supply.dm
#	code/game/machinery/cryopod.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/items/devices/communicator/messaging.dm
#	code/game/sound.dm
#	code/game/supplyshuttle.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin.dm
#	code/modules/client/preference_setup/occupation/occupation.dm
#	code/modules/events/event_container.dm
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/language/language.dm
#	code/modules/mob/living/carbon/human/human.dm
#	code/modules/mob/living/carbon/human/human_powers.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/living/carbon/human/species/species_shapeshift.dm
#	code/modules/mob/living/living.dm
#	code/modules/mob/living/living_powers.dm
#	code/modules/mob/living/say.dm
#	code/modules/mob/living/simple_animal/animals/bear.dm
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm
#	code/modules/mob/logout.dm
#	code/modules/mob/mob_helpers.dm
#	code/modules/organs/organ.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
#	code/modules/reagents/reagent_containers/syringes.dm
#	code/modules/shuttles/shuttle.dm
#	html/changelogs/.all_changelog.yml
#	maps/RandomZLevels/wildwest.dm
#	maps/southern_cross/items/clothing/sc_head.dm
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
2018-03-31 09:20:59 -04:00
BillyBanglesandAtermonera 85e377f017 Adds a cursed sword (and other haunted things) (#4931)
* adds cursed sword and 'haunted' object framework.

* fixes back.dmi conflicts

* adds cursed blade ghost pod

as well as fixing some ghost pod oddities

* fixes misc.dm conflicts

* adds cursed sword cave POI

* makes cursed sword use voice mob

as opposed to a brainmob
2018-03-19 11:49:33 -07:00
Arokha Sieyes 68a5fabe11 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
# Conflicts:
#	code/game/objects/items/devices/translator.dm
#	code/game/objects/items/weapons/dna_injector.dm
#	code/modules/client/preference_setup/loadout/loadout_ears.dm
#	code/modules/mob/living/simple_animal/aliens/hivebot.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-3.dmm
2018-03-03 13:09:57 -05:00
atermonera 48c6161c4d Adds umbrellas to loadout, for 3 points 2018-02-26 12:39:56 -08:00
Leshana 30454ccdc3 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-23
# Conflicts:
#	code/game/jobs/job_controller.dm
#	code/game/machinery/oxygen_pump.dm
#	code/game/objects/items/weapons/storage/firstaid.dm
#	code/game/objects/structures/crates_lockers/closets/secure/security.dm
#	code/modules/mob/new_player/new_player.dm
#	code/modules/organs/internal/eyes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme
2018-02-23 21:55:42 -05:00
atermonera 4197a0c117 Adds umbrellas sprites courtesy of schnayy 2018-02-17 13:30:50 -08:00