cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-16 18:36:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Garret changes."

Browse Source 
This reverts commit 05881a1561.
This commit is contained in:
MrSky12
2022-08-01 00:46:44 +02:00
parent 05881a1561
commit 92df10c505
5 changed files with 6 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/cargo/bounties/assistant.dm
+1 -13
View File
@@ -1,31 +1,19 @@
/datum/bounty/item/assistant/strange_object
name = "Strange Object"
<<<<<<< Updated upstream
description = "GATO has taken an interest in strange objects. Find one in maint, and ship it off to CentCom right away."
=======
description = "Gato has taken an interest in strange objects. Find one in maint, and ship it off to CentCom right away."
>>>>>>> Stashed changes
reward = 600
wanted_types = list(/obj/item/relic)
/datum/bounty/item/assistant/scooter
name = "Scooter"
<<<<<<< Updated upstream
description = "GATO has determined walking to be wasteful. Ship a scooter to CentCom to speed operations up."
=======
description = "Gato has determined walking to be wasteful. Ship a scooter to CentCom to speed operations up."
>>>>>>> Stashed changes
reward = 850 // the mat hoffman
wanted_types = list(/obj/vehicle/ridden/scooter)
include_subtypes = FALSE
/datum/bounty/item/assistant/skateboard
name = "Skateboard"
<<<<<<< Updated upstream
description = "GATO has determined walking to be wasteful. Ship a skateboard to CentCom to speed operations up."
=======
description = "Gato has determined walking to be wasteful. Ship a skateboard to CentCom to speed operations up."
>>>>>>> Stashed changes
reward = 700 // the tony hawk
wanted_types = list(/obj/vehicle/ridden/scooter/skateboard)
@@ -254,4 +242,4 @@
description = "Something wack is happening at Central Command, and now they requested some filled condoms?"
reward = 1150
required_count = 5
wanted_types = list(/obj/item/condom/filled)
wanted_types = list(/obj/item/condom/filled)
code/modules/cargo/bounties/chef.dm
+2 -10
View File
@@ -60,7 +60,7 @@
/datum/bounty/item/chef/superbite
name = "Super Bite Burger"
description = "Commander Lydia would like a snack. Send her a Super Bite Burger."
description = "Commander Tubbs thinks he can set a competitive eating world record. All he needs is a super bite burger shipped to him."
reward = 1800
wanted_types = list(/obj/item/reagent_containers/food/snacks/burger/superbite)
@@ -78,11 +78,7 @@
/datum/bounty/item/chef/hotdog
name = "Hot Dog"
<<<<<<< Updated upstream
description = "GATO is conducting taste tests to determine the best hot dog recipe. Ship your station's version to participate."
=======
description = "Gato is conducting taste tests to determine the best hot dog recipe. Ship your station's version to participate."
>>>>>>> Stashed changes
reward = 4000
wanted_types = list(/obj/item/reagent_containers/food/snacks/hotdog)
@@ -102,11 +98,7 @@
/datum/bounty/item/chef/chawanmushi
name = "Chawanmushi"
<<<<<<< Updated upstream
description = "GATO wants to improve relations with its sister company, Donk.Co. Ship Chawanmushi immediately."
=======
description = "Gato wants to improve relations with Donk.Co. Ship Chawanmushi immediately."
>>>>>>> Stashed changes
reward = 5000
wanted_types = list(/obj/item/reagent_containers/food/snacks/chawanmushi)
@@ -119,7 +111,7 @@
/datum/bounty/item/chef/soylentgreen
name = "Soylent Green"
description = "CentCom has heard wonderful things about the product 'Soylent Green', and would love to try some. If you indulge them, expect a pleasant bonus."
description = "CentCom has heard wonderful things about the product 'Soylent Green', and would love to try some. If you endulge them, expect a pleasant bonus."
reward = 4000
wanted_types = list(/obj/item/reagent_containers/food/snacks/soylentgreen)