ANIMAL FARM 2 #16273
ANIMAL FARM 2 #16273
Conversation
nothing to see here squaresoft no violations
…o goofbotany Conflicts: code/modules/mob/living/simple_animal/hostile/carp.dm icons/effects/effects.dmi
…o goofbotany Conflicts: code/__PATH_COMPATIBILITY/path_compatibility.dm code/game/machinery/constructable_frame.dm code/modules/cargo/packs.dm code/modules/crafting/recipes.dm code/modules/mob/living/simple_animal/friendly/farm_animals.dm code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm icons/effects/effects.dmi icons/obj/hydroponics/equipment.dmi tgstation.dme
|
are you insane |
|
just ban goofball pls |
|
|
||
| /datum/supply_pack/organic/hydroponics/exoticseeds | ||
| /datum/supply_packs/organic/hydroponics/exoticseeds |
|
HYPE |
|
Please make an attempt to actually explain what pull requests do using text and not just 100% images. I know we can go and read the code but I don't want to bother with that every time and a summary in plain english helps save everybody's sanity. |
| /obj/item/weapon/stock_parts/micro_laser = 2, | ||
| /obj/item/weapon/stock_parts/console_screen = 1, | ||
| /obj/item/weapon/stock_parts/scanning_module = 1,)/obj/item/weapon/circuitboard/incubator |
|
One of these things is not like the other... 🎵 Also, since when do we allow |
| /obj/item/weapon/stock_parts/manipulator = 1) | ||
|
|
||
| /obj/item/weapon/circuitboard/trough |
well |
|
@YotaXP because that's how we handled vehicle refactor before they were mapped on? and because we're in a map freeze so I can't map onto it? and because @RemieRichards did it, and are one of the maintainers, so it's okay? |
|
@TehZombehz find out~~~ |
| var/list/types_of_meat = list(/obj/item/weapon/reagent_containers/food/snacks/cubancarp, | ||
| /obj/item/weapon/reagent_containers/food/snacks/carpmeat, | ||
| /obj/item/weapon/reagent_containers/food/snacks/carpmeat/imitation, | ||
| /obj/item/weapon/reagent_containers/food/snacks/fishfingers, |
There was a problem hiding this comment.
Should use spaces when indenting for alignment.
There was a problem hiding this comment.
USING SPACES EVER
|
niknakleback coming in with the sweet goof downvotes |
|
Yeeeeee 👍 |
| incubated = O | ||
| SSobj.processing |= incubated | ||
| return | ||
| if(default_deconstruction_screwdriver(user, "incubator", "incubator", O)) |
There was a problem hiding this comment.
Add a fucking grey square indicating the open hatch goddam is it really hard to do?
| spawn(10) | ||
| animate(M, pixel_z = 15, time = 10) | ||
| spawn(10) | ||
| return |
There was a problem hiding this comment.
trailing return, remove.
RemieRichards
added
Merge Conflict
GOOFBALLLLLLLLLL |
|
have to remake it anyways due to @duncathan map memes |
|
you'd better fuckin finish this goofball |
|
I pray of a day when this is complete, never lose hope |
i am a meme