cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-30 07:26:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #284 from IgnusVam/master

Browse Source 
Big updoot
This commit is contained in:
Vollybally
2019-01-18 10:14:57 -05:00
committed by GitHub
parent e85c41f86f 5cfcf09e18
commit af708a78d4
12 changed files with 1142 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/toys.dm
+5 -5
View File
@@ -879,6 +879,11 @@
icon_state = "beepskyplushie"
phrase = "Ping!"
/obj/structure/plushie/silly_teshari
name = "teshari plushie"
desc = "It has a tag on the foot that says 'WHY'"
icon_state = "taaa_plush"
//Small plushies.
/obj/item/toy/plushie
name = "generic small plush"
@@ -986,11 +991,6 @@
desc = "Shiny!"
icon_state = "teshplush_rainbow"
/obj/item/toy/plushie/silly_teshari
name = "teshari plushie"
desc = "It has a tag on the foot that says 'WHY'"
icon_state = "taaa_plush"
//foxes are basically the best
/obj/item/toy/plushie/red_fox
code/game/objects/items/weapons/circuitboards/computer/computer.dm
+5
View File
@@ -173,6 +173,11 @@
build_path = /obj/machinery/computer/shuttle_control/research
origin_tech = list(TECH_DATA = 2)
/obj/item/weapon/circuitboard/medical_shuttle
name = T_BOARD("medical shuttle console")
build_path = /obj/machinery/computer/shuttle_control/medical
origin_tech = list(TECH_DATA = 2)
/obj/item/weapon/circuitboard/aifixer
name = T_BOARD("AI integrity restorer")
build_path = /obj/machinery/computer/aifixer