Skip to content

Commit

Permalink
Combo => DevTest (#267)
Browse files Browse the repository at this point in the history
* мехи и кал

Signed-off-by: N.K. <[email protected]>

* Фикс звука револьвера Горизонт-X

Фикс звука револьвера Горизонт-X

* Выводим минитменов из игры...

* Update independent_escapepod.json

Усложняем жизнь игрокам....

* Внедрение информационной системы "Griffon"

* fixes TGS test

* Rin'Daar&Co - Лучшие пиццы во всей галактике!

* HotFix: Исправлена кодировка в IC - Notes и fix пиццы с pizzamat`a

* Мини изменения Хома

Замена префикса, добавление проводка под Смесом.(да это жёстко...)

* Апдейт вентуры

Починил исчещающий ящик и пол , тинифаны заменены голобарьером

* Исправление изменений Homa-class`a

* Апдейт Хаммерхеда

Немного переработано вооружение , исправлены турели

* Апдейт хаммерхеда и утюга

Добавлены запасные карты доступа , утюг добавлены платы рнд , хаммерхед , оптимизирован боезапас оружия на борту

* Добавление невероятно эмоциональной панели

* Небольшие изменение шипа alone

* HotFix: Emote Panel

* Fixes Month Display (shiptest-ss13#2623)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Previously, the month display for IC/sector time was a month earlier
than it should have been. This also resulted in nothing displaying for
January because there is no month 0.

## Why It's Good For The Game
Time consistency and actually displaying the IC month

## Changelog

:cl:
fix: Sector time now actually shows the month of January.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* Vaporizes squid bloodpacks/random blood bags can no longer spawn with unusuable blood in them (shiptest-ss13#2626)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Squid blood doesn't exist, so these can randomly give you useless
bloodbags

This will need to be mirrored in shiptest-ss13#2553 since that replaces type L blood
with type S blood

## Why It's Good For The Game

I like my blood transfusable

## Changelog

:cl:
bugfix: bloodbags can no longer spawn with untyped (and useless) blood
in them
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

Signed-off-by: Theos <[email protected]>

* Adds missing vox mob spawner (shiptest-ss13#2625)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

they didn't have one

## Why It's Good For The Game

Vox synthesizer

## Changelog

:cl:
rscadd: admins can now spawn vox more efficiently
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

Signed-off-by: Theos <[email protected]>

* Fix date calculation (again) (shiptest-ss13#2624)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
My math was all over the place. This makes it so that there's only one
day in year day and months don't start on the second. In my defense it's
kinda hard to test this.

## Why It's Good For The Game
Time consistency

## Changelog

:cl:
fix: IC/sector months now actually start on the first and there's only
one year day
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

* re:lathe machines (shiptest-ss13#2610)

## About The Pull Request

resprites most 'production' machines. most of these are related to
research but research is fucking lame so i didn't name the pr that

also redoes the handheld radio sprite because might as fucking well
made on behalf of @Imaginos16 

## Why It's Good For The Game


![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/f33c95e2-4a68-4b83-82f4-dd6dd2e05c90)


## Changelog

:cl: Imaginos16
add: Resprites most production machines!
add: Resprites handheld radios
/:cl:

* [PORT] - Adds Coffee Machines from TG (shiptest-ss13#2584)

Full credit for sprites and original code go to:
tgstation/tgstation#70991 and
tgstation/tgstation#68178

Ports over the base coffee machine & the bean version from TG along with
several coffee making accessories

The Impress coffee machine: a bean based coffee maker, similar to the
original except you must procure coffee beans and dry them to be able to
make your coffee, currently comes in two flavours: classic and robusta!

The coffee machine: a cartridge based coffee making machine, you pop in
your desired cartridge flavour (there's 4 of them) and your pot and cook
it then pour, no hassle needed. This sprite has soul.

New sprites for the coffee cups, for all you posh people out there,
along with coffee pots to drink directly out of, you psychopaths.

Syrup bottles to add that special splash of, uh, specialness to your
coffee? And creamer.

Additionally adds boxes of these that you can buy at whatever you guys
call "cargo" so that you can just buy a whole lot of them

![image](https://github.com/shiptest-ss13/Shiptest/assets/75333826/46ff3fa5-4a9b-469d-a38e-27a5fa8f27e7)

Coffee making adds a bit of flavour to life, and there's always a good
conversation to be had about who drank directly from the coffee pot.

:cl:
add: Ports TG's Coffee Makers
soundadd: Adds coffee making sound
imageadd: Adds a new type of coffee cup and pot
code: this changes code yes
/:cl:

---------

Signed-off-by: cowbot92 <[email protected]>
Co-authored-by: Mark Suckerberg <[email protected]>

* Port some changes in status effects from /tg/ (shiptest-ss13#2582)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Ports tgstation/tgstation#64490 and partially
ports tgstation/tgstation#69951
this should have zero player-facing changes
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
Improvements from upstream, also useful if I want to port
tgstation/tgstation#75459 (which I do)
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

🆑 
code: adds some helpers for status effects
code: removes barely used defines for status effects
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

---------

Signed-off-by: GenericDM <[email protected]>
Co-authored-by: Ghom <[email protected]>
Co-authored-by: MrMelbert <[email protected]>

* Небольшой фикс pirate_santiana

* The new [SOMEWHAT NEAT] Nanotrasen Outpost!  (shiptest-ss13#2490)

## About The Pull Request
todo:
- [x] make hangars
- [x] make the rock walls indestructible
- [x] expand the bar
- [ ] open up more exterior?

Adds a brand new Nanotrasen-controlled outpost situated on an ice
planet.

Features include:
- A neat little bar.
- Two shops.
- A brig, and a security checkpoint.
- An ERT bay.
- Old maintenance tunnels containing The Horrors. (mothroach x1)
- A nice view.

## Images
<details><summary>The Outpost</summary>


![a91dad31c20289ea25ea2d1f7739ccdc](https://github.com/shiptest-ss13/Shiptest/assets/118859017/54712806-9b9f-45e2-b0ae-b1067759054e)


![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/f0632676-2853-46a2-89bf-7a36067b821d)


![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/b92f073c-eecb-42ed-94f3-1ec1b3ec60c6)

</details>

<details><summary>Hangars</summary>


![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/b34c6e4c-871d-41ad-a250-6df07afbf0f8)
20x20


![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/92f4258b-1772-4263-8568-977e6cd53124)
40x20


![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/3264bf97-007f-4f7d-9a8b-03f39e465a73)
56x20


![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/c2453d74-a7e3-4c41-982d-e3bcea87af55)
40x40


![image](https://github.com/shiptest-ss13/Shiptest/assets/118859017/39a27d66-c01b-4c2d-b03f-10966470f175)
56x40
</details>

## Changelog

🆑
add: A new Nanotrasen outpost, located on an ice planetoid, has been
added.
/🆑

* Add files via upload

Signed-off-by: N.K. <[email protected]>

* оптимизация

-шишовые статы мехов

Signed-off-by: N.K. <[email protected]>

* Кончательный фикс, i hope

Signed-off-by: N.K. <[email protected]>

---------

Signed-off-by: N.K. <[email protected]>
Signed-off-by: Theos <[email protected]>
Signed-off-by: cowbot92 <[email protected]>
Signed-off-by: GenericDM <[email protected]>
Signed-off-by: Mr_DarkBladeS <[email protected]>
Co-authored-by: N.K <[email protected]>
Co-authored-by: Mirag1993 <[email protected]>
Co-authored-by: Maybe-Anton <[email protected]>
Co-authored-by: Maybe-Anton <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Mark Suckerberg <[email protected]>
Co-authored-by: NofearNr <[email protected]>
Co-authored-by: Theos <[email protected]>
Co-authored-by: retlaw34 <[email protected]>
Co-authored-by: cowbot92 <[email protected]>
Co-authored-by: GenericDM <[email protected]>
Co-authored-by: Ghom <[email protected]>
Co-authored-by: MrMelbert <[email protected]>
Co-authored-by: goober3 <[email protected]>
  • Loading branch information
15 people authored Jan 6, 2024
1 parent e02bd8a commit 4c2ffb5
Show file tree
Hide file tree
Showing 92 changed files with 44,812 additions and 859 deletions.
47 changes: 47 additions & 0 deletions _maps/outpost/elevator_ice.dmm
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/obj/structure/elevator_platform,
/obj/machinery/light/small/directional/east{
pixel_y = 6
},
/turf/template_noop,
/area/template_noop)
"e" = (
/obj/structure/elevator_platform,
/obj/machinery/light/small/directional/east{
pixel_y = -6
},
/obj/machinery/elevator_floor_button{
pixel_y = 10;
dir = 8;
pixel_x = 24
},
/turf/template_noop,
/area/template_noop)
"A" = (
/obj/structure/elevator_platform,
/turf/template_noop,
/area/template_noop)
"S" = (
/obj/structure/elevator_platform,
/obj/machinery/status_display/elevator{
pixel_x = 32
},
/turf/template_noop,
/area/template_noop)

(1,1,1) = {"
A
A
A
"}
(2,1,1) = {"
A
A
A
"}
(3,1,1) = {"
a
S
e
"}
Loading

0 comments on commit 4c2ffb5

Please sign in to comment.