Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
82a331e
Update computer.dm
Jun 2, 2022
3fc045e
Update meat.dm
Jun 4, 2022
7e9c538
Merge branch 'yogstation13:master' into master
Jun 6, 2022
e6e36c9
Merge branch 'yogstation13:master' into master
Jun 7, 2022
db1f407
Update objects.dm
Jun 7, 2022
e43bf46
Merge branch 'yogstation13:master' into master
Jun 8, 2022
fa56816
Merge branch 'yogstation13:master' into master
Jun 9, 2022
2558753
Update computer.dm
Jun 14, 2022
e5a044c
Update meat.dm
Jun 14, 2022
6705493
Update objects.dm
Jun 14, 2022
7208d09
Merge branch 'yogstation13:master' into master
Jun 14, 2022
6d29e1d
Merge branch 'yogstation13:master' into master
Jun 18, 2022
731b43e
Merge branch 'yogstation13:master' into master
Jun 19, 2022
fb20864
Merge branch 'yogstation13:master' into master
Jun 27, 2022
86f4d4f
boowomp
Jun 27, 2022
7f26672
e
Jun 27, 2022
4d2a2f3
s
Jun 27, 2022
f2a5fd3
s
Jun 28, 2022
dfc5e8a
3
Jun 28, 2022
7ae0659
rev
Jun 29, 2022
42f71b8
Update antagonists.dm
Jun 29, 2022
55a1411
Update blob_overmind.dm
Jun 29, 2022
dd6e91b
Update radial.dm
Jun 29, 2022
0ac0cb4
Delete info.dm
Jun 29, 2022
d4bdf34
Update overmind.dm
Jun 29, 2022
5fc36bf
Update overmind.dm
Jun 29, 2022
a283836
Update powers.dm
Jun 29, 2022
172019b
Update role_preferences.dm
Jun 29, 2022
e329b12
Update job.dm
Jun 29, 2022
5515ca0
Update mind.dm
Jun 29, 2022
f01a65e
Update dynamic_rulesets.dm
Jun 29, 2022
986a199
Update dynamic_rulesets_latejoin.dm
Jun 29, 2022
a4bd274
Update dynamic_rulesets_roundstart.dm
Jun 29, 2022
32c0f01
Update antag_panel.dm
Jun 29, 2022
3ade95a
Update revolution.dm
Jun 29, 2022
9152bcd
Update bureaucratic_error.dm
Jun 29, 2022
27d1267
Update _job.dm
Jun 29, 2022
05a1a16
Update ai.dm
Jun 29, 2022
dafd04d
Delete anti_union_propaganda.txt
Jun 29, 2022
e8d7e8e
Update antagonists.dm
Jun 29, 2022
6cb432a
Update blob_overmind.dm
Jun 29, 2022
4adce07
Update generic_negative_events.dm
Jun 29, 2022
0237048
Update _blobstrain.dm
Jun 29, 2022
fb0ad06
Update _blob.dm
Jun 29, 2022
c3269d8
Update _job.dm
Jun 29, 2022
a384daa
amonus
Jul 2, 2022
f216470
del
Jul 2, 2022
087ba12
Merge branch 'yogstation13:master' into master
Jul 2, 2022
3abc65d
e
Jul 5, 2022
5f70b2c
e
Jul 5, 2022
aaeaf3b
i hope ot will work
Jul 5, 2022
9f21892
Update antagonists.dm
Jul 5, 2022
881dc02
Update role_preferences.dm
Jul 5, 2022
2154257
Update status_effects.dm
Jul 5, 2022
acf5409
Update traits.dm
Jul 5, 2022
2bf21a5
Update mind.dm
Jul 5, 2022
949cec9
Update objectives.dm
Jul 5, 2022
29b50d5
Update objectives.dm
Jul 5, 2022
b670dd3
Update traits.dm
Jul 5, 2022
938e28c
Update generic_positive_events.dm
Jul 5, 2022
157f1ac
Update dynamic_rulesets_roundstart.dm
Jul 5, 2022
0cc3edb
Update hivemind.dm
Jul 5, 2022
9a136a5
Create radar.dm
Jul 5, 2022
d7cfd56
fixes
Jul 5, 2022
716d013
fix2
Jul 5, 2022
1cac7f7
fix3
Jul 5, 2022
664023c
fix4
Jul 5, 2022
a8823db
tverb
Jul 6, 2022
6de20ae
explosive fisting is 300$
Jul 6, 2022
3d98a81
e
Jul 6, 2022
73543c4
e
Jul 7, 2022
0e390c5
bebra
Jul 7, 2022
5671de1
aboba
Jul 7, 2022
46fe58c
abobrus
Jul 7, 2022
6f1987f
e
Jul 7, 2022
8a9f587
amon sus
Jul 7, 2022
9a75443
help_verb
Jul 7, 2022
d5b4768
bebra
Jul 8, 2022
58c4e2b
e
Jul 8, 2022
651e0c2
vine snatch
Jul 8, 2022
bb7a86b
sususus amogus
Jul 9, 2022
a1184a7
e
Jul 9, 2022
2571ac6
wtf
Jul 9, 2022
9455ce4
D
Jul 9, 2022
4ef7347
help
Jul 9, 2022
2f77e16
amongus
Jul 9, 2022
cce92ca
granters
Jul 11, 2022
6ad3320
fix
Jul 11, 2022
c22302d
Update garden_warfare.dm
Jul 20, 2022
62ecf86
Merge branch 'master' into martialarts
Jul 20, 2022
b25ebc3
fixed some bugs
Aug 29, 2022
f7b9f4b
vine throw now actually throws a vine
Aug 29, 2022
5f3153a
Sex
Aug 29, 2022
86b11ba
preternis gun
Aug 29, 2022
6c4dde9
Update garden_warfare.dm
Aug 30, 2022
dae2c7b
Update garden_warfare.dm
Sep 8, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions code/__DEFINES/melee.dm
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
#define MARTIALART_FLYINGFANG "flying fang"
#define MARTIALART_HUNTERFU "hunterfu"
#define MARTIALART_FRENZYGRAB "frenzy grabbing"
#define MARTIALART_PRETERNISSTEALTH "preternis stealth"
#define MARTIALART_EXPLOSIVEFIST "explosive fist"
#define MARTIALART_GARDENWARFARE "garden warfare"


//Weapon stat defines
Expand Down
1 change: 1 addition & 0 deletions code/_onclick/hud/blob_overmind.dm
Original file line number Diff line number Diff line change
Expand Up @@ -175,3 +175,4 @@
using = new /obj/screen/blob/RelocateCore()
using.screen_loc = ui_storage2
static_inventory += using

2 changes: 1 addition & 1 deletion code/datums/martial.dm
Original file line number Diff line number Diff line change
Expand Up @@ -209,4 +209,4 @@
/datum/martial_art/proc/on_remove(mob/living/carbon/human/H)
if(help_verb)
remove_verb(H, help_verb)
return
return
66 changes: 66 additions & 0 deletions code/game/objects/items/granters.dm
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,72 @@
name = "empty scroll"
icon_state = "blankscroll"

/obj/item/book/granter/martial/preternis_stealth
martial = /datum/martial_art/stealth
name = "strange electronic board"
martialname = "Stealth"
desc = "A strange electronic board, containing some sort of software."
greet = "<span class='sciradio'>You have uploaded some combat modules into yourself. Your combos will now have special effects on your enemies, and mostly are not obvious to other people. \
You can check what combos can you do, and their effect by using Refresh Data verb in Combat Modules tab.</span>"
icon = 'icons/obj/module.dmi'
icon_state = "cyborg_upgrade"
remarks = list("Processing data...")

/obj/item/book/granter/martial/preternis_stealth/already_known(mob/user)
if(!ispreternis(user))
to_chat(user, span_warning("You don't understand what to do with this strange electronic device."))
return TRUE
return ..()

/obj/item/book/granter/martial/preternis_stealth/onlearned(mob/living/carbon/user)
..()
if(oneuse == TRUE)
desc = "It looks like it doesn't contain any data no more."

/obj/item/book/granter/martial/garden_warfare
martial = /datum/martial_art/gardern_warfare
name = "mysterious scroll"
martialname = "Garden Warfare"
desc = "A scroll, filled with a tone of text. Looks like it says something about combat and... plants?"
greet = "<span class='sciradio'>You know the martial art of Garden Warfare! Now you control your body better, then other phytosians do, allowing you to extend vines from your body and impale people with splinters. \
You can check what combos can you do, and their effect by using Remember the basics verb in Garden Warfare tab.</span>"
icon = 'icons/obj/wizard.dmi'
icon_state = "scroll2"
remarks = list("I didn't know that my body grows sprinklers...", "I am able to snatch people with vines? Interesting.", "Wow, strangling people is brutal.") ///Kill me please for this cringe

/obj/item/book/granter/martial/garden_warfare/already_known(mob/user)
if(!ispodperson(user))
to_chat(user, span_warning("You see that this scroll says something about natural abilitites of podpeople, but, unfortunately, you are not one of them."))
return TRUE
return ..()

/obj/item/book/granter/martial/garden_warfare/onlearned(mob/living/carbon/user)
..()
if(oneuse == TRUE)
desc = "It's completely blank."

/obj/item/book/granter/martial/explosive_fist
martial = /datum/martial_art/explosive_fist
name = "burnt scroll"
martialname = "Explosive Fist"
desc = "A burnt scroll, that glorifies plasmamen, and also says a lot things of explosions."
greet = "<span class='sciradio'>You know the martial art of Explosive Fist. Now your attacks deal brute and burn damage, while your combos are able to set people on fire, explode them, or all at once. \
You can check what combos can you do, and their effect by using Remember the basics verb in Explosive Fist tab.</span>"
icon = 'icons/obj/wizard.dmi'
icon_state = "scroll2"
remarks = list("Set them on fire...", "Show the punny humans who is here the supreme race...", "Make them burn...", "Explosion are cool!")

/obj/item/book/granter/martial/explosive_fist/already_known(mob/user)
if(!isplasmaman(user))
to_chat(user, span_warning("It says about very dangerous things, that you would prefer not to know."))
return TRUE
return ..()

/obj/item/book/granter/martial/explosive_fist/onlearned(mob/living/carbon/user)
..()
if(oneuse == TRUE)
desc = "It's completely blank."

// I did not include mushpunch's grant, it is not a book and the item does it just fine.


Expand Down
3 changes: 3 additions & 0 deletions yogstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -3351,6 +3351,9 @@
#include "yogstation\code\datums\diseases\advance\symptoms\confusion.dm"
#include "yogstation\code\datums\diseases\advance\symptoms\heal.dm"
#include "yogstation\code\datums\looping_sounds\darkspawn.dm"
#include "yogstation\code\datums\martial\explosive_fist.dm"
#include "yogstation\code\datums\martial\garden_warfare.dm"
#include "yogstation\code\datums\martial\stealth.dm"
#include "yogstation\code\datums\mood_events\generic_positive_events.dm"
#include "yogstation\code\datums\mutations\alcohol.dm"
#include "yogstation\code\datums\mutations\extendoarm.dm"
Expand Down
Loading