mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-17 10:03:50 +01:00
nanomap-render
7 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
|
|
2f2ebafb31 |
[EE] Adds a new medium midround event: Irradiated mouse (#31947)
* added irradiated mouse * mouse pulling buff * adds upgrade spells * cooldown on upgrades * icons and cats * radioactive sludge, health decrease, upgrades counter * objectives and sound * spells to new file + check if alive in life * afterimage * description fix, contaminate, comments * lintma? * removed empty lines, , -> :, new -> new() --------- Signed-off-by: Christer2222 <25958019+Christer2222@users.noreply.github.com> |
||
|
|
d1dad9a639 |
Import several foods and recipes from Hispania! (#31831)
* Import several foods and recipes from Hispania! * Fix trailing newlines, remove hispania icon reference. * Fix list spacing, add drink reagents, correct annona spelling. * Amend drink description, move icons * Apply new timer from @CRUNCH-Borg Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Signed-off-by: Alan <alfalfascout@users.noreply.github.com> * Apply @CRUNCH-Borg's attack chain suggestions Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Signed-off-by: Alan <alfalfascout@users.noreply.github.com> * Fix many duplicate vars. * Fix more duplicate vars. * Remove duplicate toast. * Fix unreachable callback. Now with @CRUNCH-Borg! Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Signed-off-by: Alan <alfalfascout@users.noreply.github.com> * Amend some icons. * Add vendor seeds, tweak plant sprites. - Add base seeds to MegaSeed Servitor. - Change smoked salmon sushi to use smoked salmon instead of salmon steak. - Make maize dough yellower. - Fix capitalization in peyote description. - Make coconut inedible. - Modify cream cheese recipe to remove conflict with butter. - Tweak sprites of growing plants to sit inside hydroponics trays and not move around so much. * Add guacamole recipe, agave distill reagent. - Add prep bowl recipe for guacamole, condiment container and icons. - Change cactus salad icon to use new plastic cup shape. - Add distill reagent "tequila" to agave. - Make coconuts only attack on harm intent. - Fix some whitespace. * Prevent bombonuts from detonating instantly. Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> Signed-off-by: Alan <alfalfascout@users.noreply.github.com> * Spellcheck. Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Signed-off-by: Alan <alfalfascout@users.noreply.github.com> * Change some item names, descriptions, recipes. - Make custom robot head recipe step so that those recipes don't just call for "a head". - Replace smoked salmon sushi ingredient with new smoked salmon. - Fix some confusing item names. - Update descriptions of cacti. - Add raw mouse as mouse butchering result. * Modify reagent colors. Make cream cheese bread with cream cheese. * Adjust some recipes and descriptions. - Remove hipster ridicule from mate. Add it as a reagent to the plant. - Touch up some grammar. - Amend recipe for sweet arepas. * Fix grown food slicing debug message. * Grammar improvements feat. CRUNCH Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Signed-off-by: Alan <alfalfascout@users.noreply.github.com> --------- Signed-off-by: Alan <alfalfascout@users.noreply.github.com> Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com> Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com> |
||
|
|
b0463d3c83 |
Convert most spans to defines (#31080)
* spanish? * aaaagain * keep maptext * Update robot_items.dm * Update span_defines.dm * compiles * Update silicon_mob.dm * compile |
||
|
|
04fd8b2057 | Cronchy (#31098) | ||
|
|
e609a7faf7 |
Event system refactor and changes (#29420)
* meta resolution * emerald resolution * delta resolution * fartgas resolution * box box * stay out stay out * metastation fixes * faragus fix * delta fix * Changes to role impact on event weight * adds disaster level to the event config * weight changes and starts adding disaster level to the ui * ui fixes * adjust disaster level timing * changes disaster timing, weights, disease outbreak role requirements and weights * lots of weight an requirement adjustments * Update tear.dm * some fixes * meta changes * Starting over with farragus * Starting over in faragus * faragus changes * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * Update cerestation.dmm * resolving some faragus conflicts * resolve faragus conflicts * resolves delta conflicts * resolves cyberiad conflicts * resolves emerald conflicts * fixes cables in faragus * fixes meta cables * fixes delta cables * more meta fixes * more farragus cable fixes * more cable fixes * meta and faragus fixes * box and delta fixes * more mapping fixes * hopefully the last fix * Update metastation.dmm * Update metastation.dmm * fixes shorts on cyberiad cerebron and farragus * CI fixes * move new event listing to new system * Adds tracking and cost calculation for blob * finishes setting up blob event detection and costs * minor boolog corrections * fixes events being created at the wrong severity * adds ongoing cost to disease outbreak * moves terror spider event to new system * moves to component based event cost calculation * morph abductor and carps adjusted for new system * various fixes and adjusts rev event * Update revenant_spawn_event.dm * various fixes and adjusts demon incursion to the new system * adjusts some major event weights * correct wrong values of autoend on vendor uprising and rev * Update event_container.dm * more event timing adjustments * adds requirements to traders and incursion * slightly lowers requirements for biohazards * timing changes * temporarily disable loading event times from the config and increases major nothing chance * adjustments to costs and weights of various events * Update event_container.dm * additional adjustments to weights and requirements. moves rev to major * typo fix * ion storm adjustment * Update event_container.dm * more moderate changes * e * Update meteors_event.dm * removes cooldown from nothing event and changes its weight based on the number of remaining enabled events in the container * increases morph event requirements and chance of nothing moderate event * makes morph a major event * Update morph_event.dm * adds viro requirement for disease outbreak and fixes a bug with incorrect resource calculation * allows varediting extra roles for the event system for debug and testing * Adjust weights of traders and abductors and corrects wrong nominal severity for demonic incursion * Adds crew cound to rev weight * makes disasters start rolling later * reduces weight of communications blackout and increases weight of major nothing * adjusts door runtime and prisonbreak weights to make them less frequent. kudzu now scales with total crew * apc overload made less frequent * oopsy * Gives the scrubber clog event a name * fixes a type in a define name * adjusts demonic incursion weight * changes brand intelligence weight an d reduces door runtime weight * more adjustments to demon incursion. Makes additional weight from surplus roles diminish * adjustments to some minor events * Increases event length and requirements of some engineering events and lowers their weight slightly. Also increases cost of ongoing diseases events * fixes a type * Update meteors_event.dm * corrects traders nominal severity and adjusts demon weights * shifts anomaly weights down and increases costs * rebalance rod requirements * Update cerestation.dmm * moves net resource calculation to its own proc and changes the ASSIGNMENT_TOTAL macro to ASSIGNMENT_CREW. * Adds individual first run time for some events and makes majors start rolling slightly later * reduces weight of major nothing * minor reduction to rev and apc overload weight * Changes the way event weight is calculated * end time corrections for anomaly rod and meteors * slightly adjusts down the weights of nothing and some minor events * Adjusts moedrates towards about 3.5 per round and mundanes towards 8 per round * adds first run restrictions on traders and incursion and increases the cooldown time of events * resolve faragus conflicts * resolve emerald conflict * fix some faragus cabling * more cabling correction in faragus * more cable fixes * Update cerestation.dmm * remove doubled scrubber pipe on tile * reduces moderates nothing chance * slightly reduces crew requirements for disasters and also reduces crew weight for disasters * fixes meteor event not removing the alert, and makes it announce a bit later * Adds an event debugging window for real time midround event data * Revert "Adds an event debugging window for real time midround event data" This reverts commit |
||
|
|
3e39dae7ff | fix mouse squeak (#30528) | ||
|
|
7caf75b37b |
Converts mice to basic mobs (#29928)
* Converts mice to basic mobs * Larger only targetting strat * Oops. * Linters * Code review suggestions * Linters * Merge conflict resolution * Snakes * Oops * Clogged Disposals * Updates persistent client * Linters --------- Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden> |