Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removes HoS whitelist requirement from halloween critters + nerfs them #6369

Closed
wants to merge 12 commits into from
Closed

Removes HoS whitelist requirement from halloween critters + nerfs them #6369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3f6eda8
Merge pull request #1 from goonstation/master
ThatFiveGuys Apr 23, 2021
7c26627
Merge pull request #2 from goonstation/master
ThatFiveGuys May 2, 2021
5ec8e4a
Merge branch 'goonstation:master' into master
ThatFiveGuys May 9, 2021
6e03c91
Merge branch 'goonstation:master' into master
ThatFiveGuys May 12, 2021
a810415
Merge branch 'master' of https://github.com/ThatFiveGuys/goonstation
Oct 9, 2021
bfe36b8
Merge branch 'master' of https://github.com/goonstation/goonstation
Oct 9, 2021
be71e39
Merge branch 'master' of https://github.com/goonstation/goonstation
Oct 11, 2021
2d79b15
Merge branch 'master' of https://github.com/goonstation/goonstation
Oct 18, 2021
5e0cbc9
Removes HoS whitelist + nerfs
Oct 19, 2021
f8e229d
Makes bumblespider variant for spooktober, removes unneeded crow chan…
Oct 20, 2021
d7b4267
Remy can have a little bit of additonal access, as a treat.
Oct 20, 2021
9d152bd
Bug fixes with implant
Oct 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions code/datums/jobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2160,7 +2160,6 @@ ABSTRACT_TYPE(/datum/job/special/halloween)
ABSTRACT_TYPE(/datum/job/special/halloween/critter)
/datum/job/special/halloween/critter
wages = PAY_DUMBCLOWN
requires_whitelist = 1
allow_traitors = 0
slot_ears = list()
slot_card = null
Expand All @@ -2169,7 +2168,6 @@ ABSTRACT_TYPE(/datum/job/special/halloween/critter)
/datum/job/special/halloween/critter/plush
name = "Plush Toy"
limit = 1
requires_whitelist = 0

special_setup(var/mob/living/carbon/human/M)
..()
Expand All @@ -2195,7 +2193,7 @@ ABSTRACT_TYPE(/datum/job/special/halloween/critter)
..()
if (!M)
return
M.critterize(/mob/living/critter/spider/nice)
M.critterize(/mob/living/critter/spider/nice/halloween)

/datum/job/special/halloween/critter/crow
name = "Crow"
Expand Down
6 changes: 6 additions & 0 deletions code/mob/living/critter/small_animal.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,14 @@ ABSTRACT_TYPE(/mob/living/critter/small_animal)
icon_state_dead = "remy-dead"
health_brute = 33
health_burn = 33
flags = TABLEPASS // No door pass please
pull_w_class = W_CLASS_NORMAL

New()
..()
var/obj/item/implant/access/infinite/chef/implant = new /obj/item/implant/access/infinite/chef(src) // Now dear reader, you may find yourself asking, hey Ikea, wouldnt it be sane if you just had the implant be for the job itself? And to that Id say yes, now you being a rational man/woman/being of science will of course go can you do that please? And to that I say no! Understandably this upsets you, this is bad coding! Well as it turns out, for some accursed reason it is very hard to give a critter job an implant. Now, you may understandably go, but Ikea! The ishuman checks Ikea! Turns out even if you remove those it still doesnt work! And Ive spent two hours on this and do not feel like trying further.
implant.implanted(src, src)

setup_overlays()
return

Expand Down
3 changes: 3 additions & 0 deletions code/mob/living/critter/spider.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@
venom1 = "toxin"
venom2 = "black_goop"

/mob/living/critter/spider/nice/halloween
add_abilities = list(/datum/targetable/critter/spider_bite) // Used for halloween job

/mob/living/critter/spider/baby
name = "li'l space spider"
desc = "A li'l tiny spider, from space. In space. A space spider."
Expand Down
5 changes: 5 additions & 0 deletions code/obj/item/implant.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -950,6 +950,11 @@ THROWING DARTS
..()
access.access = get_access("Staff Assistant")

chef // The mouse can have some access, as a treat
New()
..()
access.access = get_access("Chef")

shittybill //give im some access

New()
Expand Down