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

Misc PVP Flavor Text Removal #374

Draft
wants to merge 26 commits into
base: master
Choose a base branch
from
Draft

Misc PVP Flavor Text Removal #374

wants to merge 26 commits into from
+37 −38

Conversation

KoishiVibe
Copy link
Contributor

Summary

  • Sunscreen no longer contains cadmium because that's stupid. The service will take care of you because you are friggin expensive. Y'know, until you leave service. (YOUR INJURIES ARE NOT SERVICE RELATED.)
  • Prepared meals are now no longer USCMC branded. Also takes a step in removing ColMarTech from existence and finding something a little better diegetically.

KoishiVibe and others added 21 commits June 2, 2024 03:35
fuck that shit
de6c369
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
2b6c465
emails
8ea6f23
should hopefully accidently unfuck this
1e582ef
@KoishiVibe
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
38aee5f
FUCK.
b69183d
unfucks that.
d5078fe
try to fix the problem
edf2ede
i dont know why hpefully fixed????
a361ab2
hopefully fixed wait no this needs to mathc
0f713b9
@KoishiVibe
done
115e852
fucking fix you piece of shit
f0b4d03
undoes a fuckup with the master
017baf3
Merge branch 'master' of https://github.com/KoishiVibe/PVE13-KOISHI-2
3be565c
fixes issue
9698a01
@KoishiVibe
how tf did this get changed
c040c59
@KoishiVibe
flask draftoid
d681f97
@KoishiVibe
unfucks an accidental fucking commit I hate how you cant undo it fuck…
d5d3a3e 
… fuck fuck fuckfuck
@KoishiVibe
cadmium poisoning removal. fuck that. it does smell like literal actu…
59c0da2 
…al shit, however.
@KoishiVibe
whoops forgor
d04b250
@KoishiVibe
how did that get changed????
d78810c
@AndroBetel AndroBetel marked this pull request as draft August 14, 2024 11:11
@KoishiVibe KoishiVibe marked this pull request as ready for review August 14, 2024 17:49
AndroBetel
AndroBetel requested changes Aug 15, 2024
View reviewed changes
code/modules/cm_marines/equipment/gear.dm
name = "\improper USCM Prepared Meal (tofu)"
desc = "The USCM doesn't serve tofu you grass sucking hippie. The flag signifies your defeat."
name = "\improper Prepared Meal (tofu)"
desc = "A tray of machine prepared food. Consists of weirdly grainy tofu, some spicy beans, and a sour, once-zingy sauce."
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it still has the funny white flag sprite though

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

true!
i should sprite an interim sprite which will be used for the next five years
:')

@AndroBetel AndroBetel marked this pull request as draft August 18, 2024 19:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AndroBetel AndroBetel AndroBetel requested changes

@Doubleumc Doubleumc Doubleumc approved these changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
Missing Changelog
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@KoishiVibe @Doubleumc @AndroBetel