Commit Graph

277 Commits

Author SHA1 Message Date
Halcyon
a6a83a7553 [Modular] Icebox Syndies get Syndicate winter coats + Interdyne specific Syndie headsets (#9901)
* Start

b

* radio sounds description of spawners

* Removes insulated turtlenecks from spawn, gives them a winter coat instead. Adds winter coats to the syndivend as well.

* merge conflict fixes
2021-12-17 00:32:41 +00:00
SkyratBot
4d814fa8f2 [MIRROR] Tramstation Perma Genpop [MDB IGNORE] (#9741)
* Tramstation Perma Genpop

* E

* E

* Update BlueShift_middle.dmm

Co-authored-by: MMMiracles <lolaccount1@hotmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-12-13 11:29:09 +00:00
Tom
6a4537fa4e de-capitalises a few paths (#9618) 2021-11-22 20:02:25 +00:00
Tom
21f894e9b8 Spans to procs (#9495) 2021-11-16 23:29:43 +00:00
Gandalf
4a950241b6 [PRIORITY] MODULARISATION AUDIT PART 1: MAKING SKYRAT GREAT AGAIN (#9464)
* EFT

* E

* EEE

* E

* INTO TO ORBIT

* I hate this but I'm going to ignore it.

* Seriously, fuck this.

* Update CentCom_skyrat_z2.dmm

* Update tgstation.dme

* oops

* Update positronic_alert_console.dm

* E
2021-11-16 12:01:30 -05:00
OrionTheFox
768b56b71a [MODULAR][DO NOT MERGE] Sets our custom Prisoner level jumpsuits to use GAGS (#9388)
* gags moment

* actually removes the icons oops

* blueshift has ONE fricken skirt

* Revert "blueshift has ONE fricken skirt"

This reverts commit eac606bc389bfffb45364b91bc35820ccdaa3970.
2021-11-14 11:42:21 -05:00
SkyratBot
e90627be0e [MIRROR] Modernizing Radiation -- TL;DR: Radiation is now a status effect healed by tox healing, and contamination is removed [MDB IGNORE] (#9176)
* Modernizing Radiation -- TL;DR: Radiation is now a status effect healed by tox healing, and contamination is removed

* Fixing conflicts

* Makes it compile, yeet all the RAD armor from everywhere (thanks RegEx!)

* Removing more lingering rad armor (woo)

* Damnit powerarmors

* Bye bye rad collectors!

Co-authored-by: Mothblocks <35135081+Mothblocks@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2021-11-02 10:36:46 -04:00
Halcyon
5a202e80c4 [Modular] Contraband wire items for the Syndivend (#9025)
* contraband stuff for Syndivend

* drops insulated tneck+boots to 2 each
2021-10-27 21:19:54 -04:00
SkyratBot
13d38add93 [MIRROR] Repaths knives to not all be children of the kitchen knife. [MDB IGNORE] (#8843)
* Repaths knives to not all be children of the kitchen knife.

* Fix

Co-authored-by: itseasytosee <55666666+itseasytosee@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-23 00:07:08 +01:00
SkyratBot
230a34588f [MIRROR] modules/atmospherics major cleanup [MDB IGNORE] (#8818)
* modules/atmospherics major cleanup

* E

* E

* 0

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-14 22:44:30 +01:00
SkyratBot
13fe213621 [MIRROR] [MDB Ignore] Make shuttle windows deconstructable [MDB IGNORE] (#8463)
* [MDB Ignore] Make shuttle windows deconstructable

* E

* re

Co-authored-by: Mooshimi <85910816+Mooshimi@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-10-01 00:21:36 +01:00
ForrestWick
85a5ed4de3 [MODULAR] [READY][FIXES] Cargodise Lost fixes (#8421)
* cargodise fixes and ship

* Update shuttles.dm

* Update ghost_role_spawners.dm

* should be fixed?

* finished
2021-09-30 03:55:52 +01:00
ForrestWick
f2c4d21290 [MODULAR] Adds new space ruins (#8384)
* new ruins

* Made walls in the pirate and syndi ruins indestructible on the outside
2021-09-25 14:53:22 +01:00
ForrestWick
54d37f112c [MODULAR][READY] Cargodise Lost - New Ghost Role (#8133)
* cargodise lost, genesis

* cargodise lost - revelations

* Update ghost_role_spawners.dm

* made the corners overspace

* Fuck linters

* miners probably need protection...

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-24 19:22:58 +01:00
SkyratBot
26f934c258 [MIRROR] Baton refactor. item/melee/baton is now a subtype of item/melee/baton (formerly classic_baton) (#8076)
* Baton refactor. item/melee/baton is now a subtype of item/melee/baton (formerly classic_baton)

* EEEE

* E

* follow the fucking guidelines

* E

* Update CentCom_skyrat.dmm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-13 23:27:01 +01:00
SkyratBot
04302a770a [MIRROR] moves obj_integrity and associated procs to the atom level (#8016)
* moves obj_integrity and associated procs to the atom level

* Feex good

* Whoops forgot the maps

Co-authored-by: Kylerace <kylerlumpkin1@gmail.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-09-10 16:47:01 +01:00
BluBerry016
5602bd3dd5 [Modular] Imperial Enclave Remap (#7360)
* start

* move

* Update pirate_enclave.dmm

* woo

* fine gandalf here is your open floor plan gay baby jail
2021-08-04 15:11:43 +01:00
BluBerry016
abac5d0f48 [Modular] [FUCK] Fix Deck Officer access (#7322)
* Update lavaland_ruin_code.dm

* Update lavaland_ruin_code.dm
2021-08-03 20:36:17 +01:00
Yawet330
02e22e80c1 [FUCK] This is why we sanitize statements (#7272)
* WEEEWOOO

* Update genpop.dm
2021-07-31 22:03:21 +12:00
GoldenAlpharex
e9bb28b4de [MODULAR] The Beret-lliant Update (#7243)
* There's so many of them...

* Beret-lliant!

* Shut up linters
2021-07-30 12:18:13 +12:00
BluBerry016
55857e5575 Update space.dm (#7178) 2021-07-28 23:43:04 +01:00
BluBerry016
f01b7a0e5f rockplanet ghostrole bash (#7111) 2021-07-28 23:40:39 +01:00
SkyratBot
227b722820 [MIRROR] Job refactor: strings to references and typepaths [This could seriously break things :)] (#7006)
* Job refactor: strings to references and typepaths

* 0

* holy fuck

* Update preferences.dm

* Update preferences.dm

* Update preferences.dm

* Update preferences.dm

Co-authored-by: Rohesie <rohesie@gmail.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-07-28 21:12:42 +01:00
OrionTheFox
d33967c931 [WIP][Test merge me please] Rockplanet Revamp! (#6256)
* Merge the Ruins module into the Mapping module

I was always confused which to use soooo now theyre just the same

* Re-mapping + Files

THIS ISNT WORKING HELPHELPHELP

* wow thats a bad typo

fun fact, missing a single / can keep all ruins from spawning :)

* Ruins atmos + adds

There's probably a better way to do this. I'll probably have to revert the atmos things with this. Oh well.

* fixefixe

hngh

* fix that little pre-spawned ruin

hnngh

* fixes that pre-spawned ruin

hnngh OCD

* Delete quicksand.dmi

whoops

* Apply suggestions from code review

Co-authored-by: Tom <tomforde4@gmail.com>

* makes var-edited turfs into subtypes

i fucking hate it

* adds whiteship LZ (hopefully they all fit?)

* RENAMES ANY CODE MENTION TO "ROCKPLANET" FROM "ASTEROID"

Fixes having to differentiate between Asteroid(Mining planet) and Asteroid(Space object)

* rocklblnbglb

mapp p

* renames asteroid.txt to rockplanet.txt in config

* "sorts" files in the mapping module

while I'm here im gonna tidy it up ok

* fixes map conflicts

* missed a bit

* few gulag tweaks

hehe

* fix random space tile/area fuckery/aaaaaaa

* move mobs stuff about/rename/prep for The Lost

* pretty stuff.,.,.,

MY METAL POLES ARE HERE POG

* lz lz lz

* shower fix ree

Co-authored-by: Tom <tomforde4@gmail.com>
2021-07-21 15:46:16 +01:00
BluBerry016
7a96bdf82a [Modular] Player Reactivity Changes, Volume One (#6956)
* posters change

* Ship ruins

* Woo spider disk

* operative duffy

* valeborg
2021-07-19 13:45:20 +02:00
GoldenAlpharex
a57effd176 [FUCK] Turnstiles are no longer scared of flashlights (#6940)
* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Automatic changelog compile [ci skip]

* Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg

* Almost good to go, but CanPass needs to be cleaned

* Now we're cooking with gas (refactored turnstiles)

* Better code

* Turnstiles are no longer scared of flashlights.

Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Jérémie Hakier <jhakier@stingray.com>
2021-07-16 01:52:42 +01:00
GoldenAlpharex
f6f8640774 [MODULAR] You turn me right round baby right round (Fixes and refactors turnstiles) (#6856)
* Almost good to go, but CanPass needs to be cleaned

* Now we're cooking with gas (refactored turnstiles)

* Better code
2021-07-12 21:50:23 +01:00
Gandalf
95885e66a8 Prisoner Transport (#6747)
* Create prison_transport_skyrat.dmm

* Update prison_transport_skyrat.dmm

* Update shuttles.dm

* Revert "Update shuttles.dm"

This reverts commit ecce006da96af1766ad44a379d1a0bf86207a590.

* Update prison_transport_skyrat.dmm

* a

* Update outfits.dm

* Update prison_transport_skyrat.dmm
2021-07-08 16:12:00 +01:00
Gandalf
96fddaad43 aaa (#6768) 2021-07-06 23:57:04 +01:00
SkyratBot
d00afdebb9 [MIRROR] Catwalk Flooring (#6647)
* Catwalk Flooring (#59773)

* Catwalk Flooring

* a

Co-authored-by: tralezab <40974010+tralezab@users.noreply.github.com>
Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-07-02 16:43:51 +01:00
BluBerry016
fec7aea76d [Semi-Modular] DS-2: Because It's Not A Feature, It's a "Map Change". (#6487)
* Port changes from the WIP part of the feature megabundle first

* adjust that cost

* start

* Update interdynefob.dmm

* SYNDICATE STAY WINNING

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update lavaland_ruin_code.dm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* WOOO

* Update interdynefob.dmm

* Update interdynefob.dmm

* a

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update space.dm

* Update interdynefob.dmm

* Update space.dm

* Update shuttles.dm

* Update interdyne_cargo.dmm

* Update interdynefob.dmm

* Shuttle is fucking broke

* Stupid ass shuttle broke

* Update interdynefob.dmm

* Update interdynefob.dmm

* new decal

* Update interdynefob.dmm

* Update space.dm

* Update space.dm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update space.dm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* new.. closet..

* Update interdynefob.dmm

* handicapped

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update space.dm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update space.dm

* Update interdynefob.dmm

* Update space.dm

* Update interdynefob.dmm

* Update space.dm

* Update interdynefob.dmm

* Update space.dm

* secatures

* Update interdynefob.dmm

* Update space.dm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Nukes DS-1

* Nukes DS1 part 2

* Update interdynefob.dmm

* more ds2 changes

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update interdynefob.dmm

* DS2 (REAL?) (NOT FAKE)

* Update ghost_role_spawners.dm

* Update interdynefob.dmm

* Update ghost_role_spawners.dm

* Update space.dm

* Update interdynefob.dmm

* Update wildwest_skyrat.dmm

* FIX ATMOS

* aaa

* Update interdynefob.dmm

* Update interdynefob.dmm

* Update CentCom_skyrat_z2.dmm
2021-06-29 22:08:10 +01:00
capsaicinz
b6d44f1aa9 Introduces the ARBORLINK Vault Tango, a new space ruin. (#6549)
* ARBORLINK vault tango addition

* quick name fix to paper.

* arggggh shouldn't always place

* casually pumping out commit fixes

* turret changes and shtuff

* minor turret adjustments

* lights up turrets so you don't die from darkness

* you dare question my pr, skyrat bot?

* ok turns out it WAS a merge conflict

* i can have no merge conflict? just a little?
2021-06-29 16:59:05 +01:00
OrionTheFox
31952d96ee [READY]Adds two new space ruins, tiny bit of framework for other future mapping (#6507)
* Adds Spaceship turfs (First iteration)

* Moves VG decals icons into turf/decals

* GPS Computer

Literally the survival pod one re-textured to work with any wall. Good for ruins

* Fluff/machinery

just read the fluff file ffs

* Hardspace Maps

yes they're based on HS:SB. They turned out well ok

* these arent even complete but im commiting

* hbg

* New sound for AI node, wall fixes

* pre-loaded tape go brrrr

poggers

* tweaks ai node values + ghostship loot

hh

* remove two unused files, move salvagepost ID

* craftable spaceship walls (hopefully) and le cool pre-recorded tape

* properly makes spaceshipshiz craftable/placeable

* adds totally-cool sprites for the spaceship stacks :)

they arent codersprites i worked hard on them :)

* salvagepost loot and anchoring

* adds juicy ai node sprite

thamk u hay, sorry i couldnt use the big icon im not good coder :(

* replace on-turf lattices with the decal version

* oops adds the gps computer to the generic spaceruin signal
2021-06-28 14:35:16 +01:00
BluBerry016
2eba61129a [Semi-Modular] Revert Skyrat's Version Of Oldstation (#6535)
* Reverts Skyrat Oldstation

* bonk!

* Update spaceruinblacklist.txt
2021-06-26 07:13:02 +01:00
capsaicinz
0195806c81 Introducing a new space ruin, "Shuttle 8532." (#6344)
* introducing a new shuttle ruin, "SHUTTLE 8532."

fun loot. mild challenge. minor engineering issues.

* code-y wode-y update.

* UGH.

* hopefully makes linters happy. also exports as .tgm.

* slight adjustment to front turrets.

that'll show 'em for acting up and doing.. weird shit.

* anchors death ripley wreckage because i totally forgot to.

* changes up the loot game. hopefully less gamer.

* adjusts lighting, adjusts enemy amount and spawns.

aw shucks pardner, we're all outta time!

* oh god. makes the new enemy spawns actually capable of space-habitation.

https://media.discordapp.net/attachments/640744619302453316/854982761013968927/unknown.png no no no no no

* scenery changes, moving the switchblade.

* new areas for the ruin, blacklist update, about ready!

* halves the amount of turrets to make players less in sheer pain.

* small fix to lighting so you don't die to practically invisible turrets
2021-06-23 03:26:56 +01:00
Matthew J
0993d61d4c Flipped Tables and Turnstiles no longer always runtime (#6356)
* actually add the element correctly though

* do it here too
2021-06-17 12:48:14 +12:00
OrionTheFox
6e52d05e2e Merge the Ruins module into the Mapping module (#6112)
I was always confused which to use soooo now theyre just the same
2021-06-05 17:15:32 +12:00
KathrinBailey
c3d4aac47a Privateers 2.0 Prototype (#6046)
* privateer 1? Who knows.

* shutters to windows

* Linters is moaning about area path?

* Update slaver_syndie.dmm

* Backpacks are too heavy!

* Oops! Forgot AI wire helpers for the rest of the doors.

* Tiny fan in airlock.

* Emptying the Captain's backpack into the map.

It won't pass sanity tests otherwise.
2021-06-01 12:31:50 +12:00
Useroth
6cf0a33b03 More donator stuff. Clothes no longer burn completely. (#5836)
* Clothes no longer get destroyed by fire

* Added donator items and other stuff

* oops
2021-05-21 04:02:25 +02:00
BluBerry016
3409c152ed [Semi-Modular] Resurrects #1304's Catwalk Changes (#5784)
* Catwalks are now above cables and piping.

* Revert map changes

* Revert oldstation change

* merge type

* Reimplements the cable check, but for space tiles only
2021-05-21 00:21:01 +01:00
Gandalf
15cbd4c2cf Updates our alerts to TGUI_ALERT (#5832)
* a

* Update observer.dm
2021-05-21 00:15:22 +01:00
Gandalf
de46177cf7 MOVES ALL FUCKING CLOTHING ICONS TO MASTER FILES AND BANS THE USE OF CLOTHING MODULE ICON FILES - [DEVCON 1] (#5781)
* FUCK YOU

* Update readme.md
2021-05-19 12:01:43 +12:00
BluBerry016
bc133497ad [Modular] Fix for round ID 1739's Syndicate Problem (#5705)
* move the plaques ti wakks

* Interdyne/cybersun guaranteed
2021-05-15 04:53:20 +01:00
BluBerry016
63b349ad08 [Modular] Add Skyrat-Specific Commemorative Map-Plaques (Rebase Maps Only). (#5659)
* Plaque code

* fixes + mapping
2021-05-14 00:53:48 +01:00
BluBerry016
c9d2f4d6f6 [Modular] Interdyne Fixes/Major Tweak. (#5603)
* Spite PR

* GPS
2021-05-13 15:16:34 +01:00
BluBerry016
fb5fe81d2d [Modular] Utility Sec Fix + Syndicate Outfit Overhaul (#5628)
* Utility Sec Fix + Syndicate Outfit Overhaul

* Update lavaland_ruin_code.dm
2021-05-13 14:22:46 +01:00
FlamingLily
bdbf027df3 GENPOP lockers give different prison outfits per allocated time, and general prison outfit code cleanup. (#5494)
* p

* Update modular_skyrat/modules/mapping/code/genpop.dm

Co-authored-by: Gandalf <jzo123@hotmail.com>

* Update modular_skyrat/modules/mapping/code/genpop.dm

Co-authored-by: Gandalf <jzo123@hotmail.com>

Co-authored-by: Gandalf <jzo123@hotmail.com>
2021-05-07 08:18:17 +01:00
BluBerry016
67c5c2fec0 Reverts Shipstation (#5414) 2021-05-02 22:58:31 +01:00
BluBerry016
5a22667f9f No more double Interdyne (#5289) 2021-04-28 23:24:14 +01:00
BluBerry016
f1d341785d [Modular] The Deck Officer's New Groove (#5233)
* Hail, Hail Cargonia

* Land of stolen things
2021-04-27 00:05:45 +01:00