shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove bad words

Browse Source
This commit is contained in:
Linzolle
2020-04-14 17:54:07 -05:00
parent f828f4c4b7
commit 39e6541ccd
9 changed files with 24 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
_maps/RandomRuins/SpaceRuins/bus.dmm
View File

@@ -66,7 +66,7 @@
/obj/structure/fluff/bus/passable/seat{
icon_state = "backseat"
},
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
},
@@ -90,7 +90,7 @@
/obj/structure/fluff/bus/passable/seat{
icon_state = "backseat"
},
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
@@ -158,9 +158,9 @@
"aA" = (
/obj/structure/fluff/bus/passable,
/obj/structure/closet/crate/freezer,
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/obj/item/reagent_containers/food/snacks/meatball,
/obj/item/reagent_containers/food/snacks/meatball,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
},
@@ -182,7 +182,7 @@
/area/ruin/unpowered/no_grav)
"aD" = (
/obj/structure/fluff/bus/passable,
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
},
@@ -256,7 +256,7 @@
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"aP" = (
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/turf/open/floor/plating/asteroid/airless,
/area/ruin/unpowered/no_grav)
"aQ" = (
@@ -282,7 +282,7 @@
icon_state = "backseat"
},
/obj/effect/decal/cleanable/dirt,
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
},
@@ -318,7 +318,7 @@
"aZ" = (
/obj/structure/fluff/bus/passable,
/obj/effect/decal/cleanable/dirt,
/obj/item/reagent_containers/food/snacks/faggot,
/obj/item/reagent_containers/food/snacks/meatball,
/turf/open/floor/plasteel/airless/dark{
icon_state = "bus"
},

2
code/__DEFINES/inventory.dm
View File

@@ -147,7 +147,7 @@
//flags for covering body parts
#define GLASSESCOVERSEYES (1<<0)
#define MASKCOVERSEYES (1<<1) // get rid of some of the other [censored for github] in these flags
#define MASKCOVERSEYES (1<<1) // get rid of some of the other stupidity in these flags
#define HEADCOVERSEYES (1<<2) // feel free to realloc these numbers for other purposes
#define MASKCOVERSMOUTH (1<<3) // on other items, these are just for mask/head
#define HEADCOVERSMOUTH (1<<4)

2
code/__HELPERS/game.dm
View File

@@ -183,7 +183,7 @@
return
// Better recursive loop, technically sort of not actually recursive cause that shit is [censored for github], enjoy.
// Better recursive loop, technically sort of not actually recursive cause that shit is stupid, enjoy.
//No need for a recursive limit either
/proc/recursive_mob_check(atom/O,client_check=1,sight_check=1,include_radio=1)

4
code/modules/mob/living/carbon/alien/humanoid/update_icons.dm
View File

@@ -53,7 +53,7 @@
/mob/living/carbon/alien/humanoid/update_transform() //The old method of updating lying/standing was update_icons(). Aliens still expect that.
if(lying > 0)
lying = 90 //Anything else looks [censored for github]
lying = 90 //Anything else looks silly
..()
update_icons()
@@ -95,4 +95,4 @@
hands += mutable_appearance(alt_inhands_file, "[itm_state][caste]_r", -HANDS_LAYER)
overlays_standing[HANDS_LAYER] = hands
apply_overlay(HANDS_LAYER)
apply_overlay(HANDS_LAYER)

14
html/archivedchangelog.html
View File

@@ -6394,7 +6394,7 @@ start of their shift.</li>
<ul>
<li><b><a href='#' id='greekrioter_link' onclick="changeText('greekrioter_tag','Agouri', 'greekrioter_link')"><span id='greekrioter_tag'>Greek Rioter</span></a> updated:</b>
<ul>
<li>Removed dumb/badly sprited drinks for barman. This is for you, people that love to play barman. Your job is now non-retarded again. <font color='red'><b>EDIT: FIXED DRINK MIXING</b></font></li>
<li>Removed dumb/badly sprited drinks for barman. This is for you, people that love to play barman. Your job is now non-stupid again. <font color='red'><b>EDIT: FIXED DRINK MIXING</b></font></li>
<li>More info here: <a href="http://code.google.com/p/tgstation13/source/detail?r=2136/" target='_blank'>rev2136</a></li>
</ul>
</li>
@@ -7315,7 +7315,7 @@ resistance (only slight don't run into a fire).</li>
<li>HoS, Warden and Security Officer starting equipment changed.</li>
<li>New crate, which contains armored vests and helmets. Requires security access, costs 20.</li>
<li>Miner lockers now contain meson scanners and mining jumpsuits.</li>
<li>Food crate now contains milk, instead of faggots. Lightbulb crates cost reduced to 5. Riot crates cost reduced to 20. Emergency crate contains 2 med bots instead of floor bots. Hydroponics crate no longer contains weed spray, pest spray. It's latex gloves were replaced with leather ones and an apron. </li>
<li>Food crate now contains milk, instead of meatballs. Lightbulb crates cost reduced to 5. Riot crates cost reduced to 20. Emergency crate contains 2 med bots instead of floor bots. Hydroponics crate no longer contains weed spray, pest spray. It's latex gloves were replaced with leather ones and an apron. </li>
<li>Added chef's apron (can hold a kitchen knife) and a new service borg sprite. </li>
<li>Autolathe can now construct kitchen knives. </li>
<li>Biosuit and syndicate space suits can now fit into backpacks. </li>
@@ -8139,7 +8139,7 @@ resistance (only slight don't run into a fire).</li>
-Meatbread: 3 meats (whatever meats) 3 flour 3 cheese. Can be sliced.
Cheese_amount is actually displayed on the microwave.</li>
<li> Profession-special radio channels now have color.</li>
<li> AI card not retardedly lethal anymore, for anyone that didn't notice</li>
<li> AI card not stupidly lethal anymore, for anyone that didn't notice</li>
<li> HYDROPONICS OVERHAUL, credit goes to Skie and Numbers. Wood doesn't have the entity so the tower caps cannot be harvested. For now.</li>
<li> Bar is now barman-only, access-wise. No more shall the entire station trump inside the bar and choke the monkey.</li>
<li> Prepping ground for Barman update (SPRITE ME SOME GODDAMN BOTTLES)</li>
@@ -8496,7 +8496,7 @@ resistance (only slight don't run into a fire).</li>
<strong>New spell: Mindblast</strong>
<ul>
<li>
Causes brain damage, progressively causing other players to become even more retarded.
Causes brain damage, progressively causing other players to become even more stupid.
</li>
</ul>
</li>
@@ -8693,7 +8693,7 @@ resistance (only slight don't run into a fire).</li>
<li>BACKUP BACKUP TELL ME WHAT YOU GONNA DO NOW Changed the monkey name code. Re-did
my antimatter engine code so it actually puts out power now</li>
<li>dumb as fuck change, whoever did that, it already spawn ()&amp;#39;s inside the proc
code, whoever did that, you are a faggot and should read code before you modify
code, whoever did that, you are a fool and should read code before you modify
it</li>
<li>Fixed a bug that gave everyone modify ticker variables you silly sausage.</li>
<li>Sorted the AIs track list.</li>
@@ -8896,7 +8896,7 @@ resistance (only slight don't run into a fire).</li>
<li>Fixed the syndicate nuclear victory bug</li>
<li>Wizard now spawns with wizard outfit which he must wear to cast spells</li>
<li>Blood bug fixes</li>
<li>Fixed a retarded bug that meant I didn't have the power to kick admins</li>
<li>Fixed a dumb bug that meant I didn't have the power to kick admins</li>
<li>THUNDERDOME!</li>
<li>Several new facial hair options and a bitchin' mohawk</li>
<li>Blood by Culka</li>
@@ -9048,4 +9048,4 @@ resistance (only slight don't run into a fire).</li>
<li>Seperated male and female names.</li>
<li>Females have pink underwear.</li>
<li>Guests can no longer save/load profiles, as this just created useless profiles that weren't used again.</li>
</ul>
</ul>

1
strings/insult.json
View File

@@ -81,7 +81,6 @@
"nouns_generic": [
"you",
"that faggot traitor",
"you there",
"guy",
"person",

2
strings/ion_laws.json
View File

@@ -766,7 +766,7 @@
"THIRTEEN SEQUELS",
"THREE WISHES",
"A SITCOM",
"THAT GRIEFING FAGGOT GEORGE MELONS",
"THAT GRIEFING GEORGE MELONS",
"FAT GIRLS ON BICYCLES",
"SOMEBODY TO PUT YOU OUT OF YOUR MISERY",
"HEROES IN A HALF SHELL",

4
strings/names/death_commando.txt
View File

@@ -61,10 +61,10 @@ Splint Chesthair
Stabby McGee
Stump Beefgnaw
Stump Chunkman
THAT DAMN FAGGOT TRAITOR GEORGE MELONS
THAT DAMN TRAITOR GEORGE MELONS
Theodore Pain
Thick McRunfast
Toolboxl Rose
Touch Rustrod
Trunk Slamchest
Zombie Gandhi
Zombie Gandhi

7
strings/traumas.json
View File

@@ -3,7 +3,7 @@
"@pick(semicolon)IM A PONY NEEEEEEIIIIIIIIIGH",
"without oxigen blob don't evoluate?",
"@pick(semicolon)CAPTAINS A COMDOM",
"@pick(semicolon)@pick(faggot_traitor) @pick(george) @pick(mellens) is grifing me HALP!!!",
"@pick(semicolon) @pick(george) @pick(mellens) is grifing me HALP!!!",
"can u give me @pick(mutations)?",
"THe saiyans screwed",
"Bi is THE BEST OF BOTH WORLDS>",
@@ -156,11 +156,6 @@
"mwrlins"
],
"faggot_traitor": [
"",
"that faggot traitor"
],
"random_gibberish": [
"g",
"squid",