|
1392 | 1392 | #define CARTON_PEACH "peach ice cream" |
1393 | 1393 | #define CARTON_CHERRY_CHOCOLATE "cherry chocolate ice cream" |
1394 | 1394 | #define CARTON_MEAT "meat lover's ice cream" |
| 1395 | +#define BOX_CAKE "cake cone" |
| 1396 | +#define BOX_CHOCOLATE "chocolate cone" |
1395 | 1397 |
|
1396 | 1398 | /obj/item/storage/box/ice_cream_carton |
1397 | 1399 | icon_state = "ice_cream" |
|
1400 | 1402 | desc = "A classic ice cream brand; this carton contains plain ice cream." |
1401 | 1403 |
|
1402 | 1404 | //What flavor will be inside the carton |
1403 | | - var/ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop |
| 1405 | + var/item_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop |
| 1406 | + //String for extra examine |
| 1407 | + var/container_type = "carton" |
| 1408 | + //String for ice cream vat |
| 1409 | + var/contents_type = "ice cream" |
| 1410 | + |
1404 | 1411 |
|
1405 | 1412 | /obj/item/storage/box/ice_cream_carton/Initialize(mapload) |
1406 | 1413 | . = ..() |
1407 | 1414 | var/datum/component/storage/STR = GetComponent(/datum/component/storage) |
1408 | 1415 | STR.max_items = 7 |
1409 | | - STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/ice_cream_scoop)) |
| 1416 | + //Check if it is a scoop carton or cone box |
| 1417 | + if(!istype(src, /obj/item/storage/box/ice_cream_carton/cone)) |
| 1418 | + STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/ice_cream_scoop)) |
| 1419 | + else |
| 1420 | + STR.set_holdable(list(/obj/item/reagent_containers/food/snacks/ice_cream_cone)) |
1410 | 1421 |
|
1411 | 1422 | /obj/item/storage/box/ice_cream_carton/PopulateContents() |
1412 | 1423 | for(var/i in 1 to 7) |
1413 | | - new ice_cream_flavor(src) |
| 1424 | + new item_flavor(src) |
1414 | 1425 |
|
1415 | 1426 | /obj/item/storage/box/ice_cream_carton/attackby(obj/item/A, mob/user, params) |
1416 | 1427 | //Allow for name and desc to be changed with pen |
1417 | 1428 | if(istype(A, /obj/item/pen)) |
1418 | | - var/choice = input(usr, "Choose which flavor to change to", "Changing Carton Flavor") as null|anything in list(CARTON_PLAIN, CARTON_VANILLA, CARTON_CHOCOLATE, CARTON_STRAWBERRY, CARTON_BLUE, CARTON_LEMON_SORBET, CARTON_CARAMEL, CARTON_BANANA, CARTON_ORANGE_CREAMSICLE, CARTON_PEACH, CARTON_CHERRY_CHOCOLATE, CARTON_MEAT) |
1419 | | - if(choice != null) |
1420 | | - name = "Big Top [choice] carton" |
1421 | | - desc = "A classic ice cream brand; this carton contains [choice]." |
| 1429 | + //Check if it is a scoop carton or cone box |
| 1430 | + if(!istype(src, /obj/item/storage/box/ice_cream_carton/cone)) |
| 1431 | + var/choice = input(usr, "Choose which flavor to change to", "Changing Container Flavor") as null|anything in list(CARTON_PLAIN, CARTON_VANILLA, CARTON_CHOCOLATE, CARTON_STRAWBERRY, CARTON_BLUE, CARTON_LEMON_SORBET, CARTON_CARAMEL, CARTON_BANANA, CARTON_ORANGE_CREAMSICLE, CARTON_PEACH, CARTON_CHERRY_CHOCOLATE, CARTON_MEAT) |
| 1432 | + if(choice != null) |
| 1433 | + name = "Big Top [choice] carton" |
| 1434 | + desc = "A classic ice cream brand; this carton contains [choice]." |
| 1435 | + else |
| 1436 | + var/choice = input(usr, "Choose which flavor to change to", "Changing Container Flavor") as null|anything in list(BOX_CAKE, BOX_CHOCOLATE) |
| 1437 | + if(choice != null) |
| 1438 | + name = "Big Top [choice] box" |
| 1439 | + desc = "A classic ice cream brand; this box contains [choice]s." |
1422 | 1440 | return |
1423 | 1441 | ..() |
1424 | 1442 |
|
1425 | 1443 | /obj/item/storage/box/ice_cream_carton/examine(mob/user) |
1426 | 1444 | . = ..() |
1427 | | - . += span_notice("You can change the carton's flavor with a <b>Pen<b>.") |
| 1445 | + . += span_notice("You can change the [container_type]'s flavor with a <b>Pen<b>.") |
1428 | 1446 | if(length(contents) == 0) |
1429 | | - . += span_warning("This carton is <b>EMPTY<b>!!") //PANIC!! |
| 1447 | + . += span_warning("This [container_type] is <b>EMPTY<b>!!") //PANIC!! |
1430 | 1448 |
|
1431 | 1449 | /obj/item/storage/box/ice_cream_carton/update_overlays() |
1432 | 1450 | . = ..() |
|
1440 | 1458 | else |
1441 | 1459 | carton_overlay = "_lid" |
1442 | 1460 |
|
1443 | | - var/mutable_appearance/ice_cream_overlay = mutable_appearance(icon, "ice_cream[carton_overlay]") |
| 1461 | + var/mutable_appearance/ice_cream_overlay = mutable_appearance(icon, "[icon_state][carton_overlay]") |
1444 | 1462 | . += ice_cream_overlay |
1445 | 1463 |
|
1446 | 1464 | /obj/item/storage/box/ice_cream_carton/vanilla |
1447 | 1465 | name = "Big Top vanilla ice cream carton" |
1448 | 1466 | desc = "A classic ice cream brand; this carton contains vanilla ice cream." |
1449 | | - ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/vanilla |
| 1467 | + item_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/vanilla |
1450 | 1468 |
|
1451 | 1469 | /obj/item/storage/box/ice_cream_carton/chocolate |
1452 | 1470 | name = "Big Top chocolate ice cream carton" |
1453 | 1471 | desc = "A classic ice cream brand; this carton contains chocolate ice cream." |
1454 | | - ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/chocolate |
| 1472 | + item_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/chocolate |
1455 | 1473 |
|
1456 | 1474 | /obj/item/storage/box/ice_cream_carton/strawberry |
1457 | 1475 | name = "Big Top strawberry ice cream carton" |
1458 | 1476 | desc = "A classic ice cream brand; this carton contains strawberry ice cream." |
1459 | | - ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/strawberry |
| 1477 | + item_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/strawberry |
1460 | 1478 |
|
1461 | 1479 | /obj/item/storage/box/ice_cream_carton/blue |
1462 | 1480 | name = "Big Top blue ice cream carton" |
1463 | 1481 | desc = "A classic ice cream brand; this carton contains blue ice cream." |
1464 | | - ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/blue |
| 1482 | + item_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/blue |
1465 | 1483 |
|
1466 | 1484 | /obj/item/storage/box/ice_cream_carton/lemon_sorbet |
1467 | 1485 | name = "Big Top lemon sorbet carton" |
1468 | 1486 | desc = "A classic ice cream brand; this carton contains lemon sorbet." |
1469 | | - ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/lemon_sorbet |
| 1487 | + item_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/lemon_sorbet |
1470 | 1488 |
|
1471 | 1489 | /obj/item/storage/box/ice_cream_carton/caramel |
1472 | 1490 | name = "Big Top caramel ice cream carton" |
1473 | 1491 | desc = "A classic ice cream brand; this carton contains caramel ice cream." |
1474 | | - ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/caramel |
| 1492 | + item_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/caramel |
1475 | 1493 |
|
1476 | 1494 | /obj/item/storage/box/ice_cream_carton/banana |
1477 | 1495 | name = "Big Top banana ice cream carton" |
1478 | 1496 | desc = "A classic ice cream brand; this carton contains banana ice cream." |
1479 | | - ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/banana |
| 1497 | + item_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/banana |
1480 | 1498 |
|
1481 | 1499 | /obj/item/storage/box/ice_cream_carton/orange_creamsicle |
1482 | 1500 | name = "Big Top orange creamsicle carton" |
1483 | 1501 | desc = "A classic ice cream brand; this carton contains orange creamsicle." |
1484 | | - ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/orange_creamsicle |
| 1502 | + item_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/orange_creamsicle |
1485 | 1503 |
|
1486 | 1504 | /obj/item/storage/box/ice_cream_carton/peach |
1487 | 1505 | name = "Big Top peach ice cream carton" |
1488 | 1506 | desc = "A classic ice cream brand; this carton contains peach ice cream." |
1489 | | - ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/peach |
| 1507 | + item_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/peach |
1490 | 1508 |
|
1491 | 1509 | /obj/item/storage/box/ice_cream_carton/cherry_chocolate |
1492 | 1510 | name = "Big Top cherry chocolate ice cream carton" |
1493 | 1511 | desc = "A classic ice cream brand; this carton contains cherry chocolate ice cream." |
1494 | | - ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/cherry_chocolate |
| 1512 | + item_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/cherry_chocolate |
1495 | 1513 |
|
1496 | 1514 | /obj/item/storage/box/ice_cream_carton/meat |
1497 | 1515 | name = "Big Top meat lover's ice cream carton" |
1498 | 1516 | desc = "A classic ice cream brand; this carton contains meat lover's ice cream." |
1499 | | - ice_cream_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/meat |
| 1517 | + item_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_scoop/meat |
| 1518 | + |
| 1519 | +/obj/item/storage/box/ice_cream_carton/cone |
| 1520 | + icon_state = "cone_box" |
| 1521 | + name = "Big Top cake cone box" |
| 1522 | + desc = "A classic ice cream brand; this box contains cake cones." |
| 1523 | + item_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_cone/cake |
| 1524 | + container_type = "box" |
| 1525 | + contents_type = "cones" |
| 1526 | + |
| 1527 | +/obj/item/storage/box/ice_cream_carton/cone/chocolate |
| 1528 | + name = "Big Top chocolate cone box" |
| 1529 | + desc = "A classic ice cream brand; this box contains chocolate cones." |
| 1530 | + item_flavor = /obj/item/reagent_containers/food/snacks/ice_cream_cone/chocolate |
1500 | 1531 |
|
1501 | 1532 | #undef CARTON_PLAIN |
1502 | 1533 | #undef CARTON_VANILLA |
|
1510 | 1541 | #undef CARTON_PEACH |
1511 | 1542 | #undef CARTON_CHERRY_CHOCOLATE |
1512 | 1543 | #undef CARTON_MEAT |
| 1544 | +#undef BOX_CAKE |
| 1545 | +#undef BOX_CHOCOLATE |
0 commit comments