Commit Graph
16 Commits
Author SHA1 Message Date
WaterpigandGitHub 6e6c0217f1 Cafe areas now actually have inheritance (#27202)
* I will use size collars

* woops

* does it need this?

* It does I just had a moth dust
2024-04-18 03:02:49 +02:00
WaterpigandGitHub c0ab4e707f Fixes machine frames on maps (#26798)
* Machine fixes

* wrong name on this

* Revert "Machine fixes"

This reverts commit e3fca7dca2859ee26bfe6cdc13ff9c75a416b461.

* I need to rerun this

* there we go

* Extra updates, split up into two just in case
2024-03-08 19:16:45 -05:00
7985c9c92e refreshing overrides - sectech (makes energy holsters buyable) (#25282)
* graaah i hate overrides

* name finally relevant

* check check one two one two

* Update modular_skyrat/modules/sec_haul/code/misc/packs.dm

---------

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
Co-authored-by: Bloop <13398309+vinylspiders@users.noreply.github.com>
2023-12-06 06:55:15 +00:00
854f662191 Updates a lot of security clothing, unifies a lot of the security blue colors that were all over the place, some other things (#23455)
* get real

* uhhh everything?

* some other stuff

* awawawa

* that can got too then

* reinstates the sprite changes

* man in suit gif

* Update packs.dm

---------

Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
2023-10-15 22:00:31 -07:00
ZydrasandGitHub d5bc4267e8 [MODULAR] Fixes NTrep and Blueshield area subtypes (#23804)
* .dm fixes for area subtypes

* adds repath txt

* scripts ran
2023-09-19 21:21:42 -04:00
59c78aa308 epic squad hospital corpsman gameplay - adds pocket-fitting first-aid pouches to cargo (#22951)
* epic tgmc gameplay (100% real no clickbait)

* boom! big reveal! i'm repath rick

* fixing some misc code typos. 6 slots to 4 slots

* regular space jumpscare

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* medkit pouch fixed

* hello, the consequences of my own actions

---------

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2023-08-24 16:15:25 -07:00
0629bd5128 [MIRROR] Heavily reworks and resprites first aid analyzers. [MDB IGNORE] (#22293)
* Heavily reworks and resprites first aid analyzers.

* Update _bodyparts.dm

Merge pt 1

* Update health_analyzer.dm

Merge pt 2

* Fixing some merge conflicts

* Run UpdatePaths

---------

Co-authored-by: carlarctg <53100513+carlarctg@users.noreply.github.com>
Co-authored-by: Bloop <vinylspiders@gmail.com>
2023-07-12 12:28:03 +00:00
44a6764f2f crush my legs with a hammer i must (adds kneecapping on breach hammers) (#21994)
* repath and funny

* confession: i just find-replaced all hammer paths

* hammer_breaching -> breaching_hammer

---------

Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>
2023-06-27 09:49:47 -04:00
dcc19c49d3 [MIRROR] [MDB IGNORE] Adds a map lint against using non-dir helper posters [MDB IGNORE] (#21493)
* [MDB IGNORE] Adds a map lint against using non-dir helper posters

* updatepaths

* updatepaths + our own script and conversions

* hand edits

* bruh

---------

Co-authored-by: Jolly <70232195+Jolly-66@users.noreply.github.com>
2023-05-29 01:55:14 +00:00
JollyandGitHub 230ef2d3a6 Nukes the stupid darkblue turf decals once and for all (#19848)
* STOP DOING THIS SO HELP ME JESUS CHRIST IN HEAVEN

* filename
2023-03-15 21:31:13 -07:00
JollyandGitHub 9f6dcc3a04 Renames OUR UpdatePath scripts to follow what /tg/ does (adds the PR number) (#19782)
hi :)
2023-03-13 04:41:52 +00:00
JollyandGitHub cd0529f807 Nukes the stupid blue/darkblue in favor of dark_blue, aka one of my spite PRs over something stupid (#19781)
* SPITE COMMIT

* file
2023-03-12 18:38:21 -04:00
TastyfishandGitHub 6cbb382f4c [MODULAR] Adds cryo to permabrig 2: Electric Grillaboo (#18556)
* Adds prison-specific cryo

* Fix cryo console icon

* maps
2023-02-04 12:54:22 -05:00
7ee524f748 [MIRROR] Basic Mob Carp Part VIII: Basic Mob Carp [MDB IGNORE] (#18344)
* Basic Mob Carp Part VIII: Basic Mob Carp

* maps

* missed killing main carp file

* shorki and ocean biomes

* shorki 2: pet-a-boogaloo

Co-authored-by: Jacquerel <hnevard@gmail.com>
Co-authored-by: tastyfish <crazychris32@gmail.com>
2023-01-09 05:48:50 -05:00
GandalfandGitHub f0aa91940a Hat path updates (#16753)
* ew

* wew

* wew

* Update loadout_datum_heads.dm

* wew

* e
2022-10-10 14:12:36 +01:00
JollyandGitHub 3a8f63d5ae Nukes Salon area define from maps, uses upstreams Barber (#15230)
fuck i didn't realize i baked tram
2022-07-29 19:26:12 -05:00