Commit Graph

379 Commits

Author SHA1 Message Date
Cark
7895a136c0 New Emergency Shuttle: The Cozy Shuttle (#20393)
* basics

* just needs the dock marker now

* oh im dumb its just a named docking port

* is this really all i have to do?

* wtf

* final touches

* some fixes

* ok

* the crew can have a few firelocks, as a treat

* newbridge

* Update shuttles.dm

* e
2023-09-24 16:11:46 -05:00
Maxim
80f7b92d98 Adds a new emergency shuttle: The Crowd-Source Shuttle (#20030)
* kermit

* Revert "kermit"

This reverts commit c44c865773.

* Adds shuttle

* Removes yogstation changes

* Test

* e

* eee

* etasdwasdwa

* awdasdwasd

* hmm

* i forgot

* Update shuttles.dm

* Update shuttles.dm

* Changes button IDs
2023-08-22 16:09:31 -04:00
N3D6
2adec0d393 [MDB IGNORE] IceMeta (#18054)
* Starts placing ice and snow at evac, makes shuttle dock

* IceMeta dm and json file

* A lot more ice and snow

* two files/?????

* maybe halfway done placing ice if even lol

* more ice. almost done with this LONG ASS PROCESS

* engines, maybe? this will take some testing

* a lotta lotta ice (HOLY SHIT I ALMOST CLOSED MY BROWSER WITHOUT COMMITTING THIS)

* Finishes placing ice and adds genturf around the map

* oops!

* couple little bugaroonies

* some stuff i missed

* some more stuff, mining base is done, added snow to some space i missed things

* stuff

* oops

* Config

* new landmarks

* ioopssie poopsie!!!!!!!!!!!

* forgor

* fmaily guy

* forgot like one or twenty tiles of ice

* Rename the map

* fix that a little

* why was this not here exactly?

* ATV room

* podbay door

* finishes up

* disables meta

* coats, boots and a pickaxe

* i caught you on camera acting sus

* removes bloat bandaid fix

* replaces bloat with not bloat

* finishes fixing that stuff

* oops

* space tile

* Quality issues and makes a cool snow path around the stayshun

* airless turf no bueno

* expand escape shuttle dock

* update meta

* fuck you *steals atmos*

* ye

* plz work uwu

* snow tiles on engine

* jortz

* makes tesla template look much better

* cleans up the outside of the station more

* sussy

* icemoon 2 z levels now

* Revert "icemoon 2 z levels now"

This reverts commit 9a6aaeea2e.

* plz work this time

* fixes json

* why isn't it working

* ned you're fucking retarded

* god fucking damnit ned

* poop

* Revert "poop"

This reverts commit 62cecf79eb.

* ok this time it should work

* one more thing

* fortnite

* rip spacemeta.... you did well

* ned are you fucking dumb?

* what the flip

* a zillion errors

* what the hell was the point of this?

* oops

* axes bloat icemoon maps

* forgot to delete this one lol

* adds joe the goliath to the mining base. super important change

* maybe fixes that? probably not

* fixes 2 runtimes

* fixes another runtime

* fix window

* b

* l

* fixes lavaland spawning

* random maint ruins with space in them suck anyway

* dogshit ass ruins

* fuck you maint ruins

* dilithium spawns now

* fixes KAs again and makes legion damage ignore apply to mining levels again

* b

* left some space

* prolly fixes solars

* Revert "Merge remote-tracking branch 'upstream/master' into icemeta"

This reverts commit 82e3ad1c73, reversing
changes made to 9d918cf020.

* Revert "Merge branch 'icemeta' of https://github.com/N3D6/YogstationIfItWasntMid into icemeta"

This reverts commit 9d918cf020, reversing
changes made to f06088b78b.

* Revert "Merge remote-tracking branch 'upstream/master' into icemeta"

This reverts commit f06088b78b, reversing
changes made to c217b19fcc.

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into icemeta""

This reverts commit e4e618015c.

* Revert "Revert "Merge branch 'icemeta' of https://github.com/N3D6/YogstationIfItWasntMid into icemeta""

This reverts commit 6982c478e5.

* Revert "Revert "Merge remote-tracking branch 'upstream/master' into icemeta""

This reverts commit 5ea59d7339.

* security interace

* walls instead of windows for the space loop pipes so it's less cancerous in the long run

* Expands mining station atmos a little, shifts some stuff around the mining base in general, adds a heater so the base no longer gets mad chilly

* forgot a decal

* didn't commit it

* y

* ned

* i love this so much!

* brig :)

* L bozo

* THE DECALENING PART TWO: SCIENCE (#2)

* remove tiles

* forgot some red tiles

* farts

* done

* THE GREAT DECALENING PART 3: EVERYTHING ELSE (#3)

* should kill most tile decals

* should finish murdering old ones

* hey buddy you dropped this

* probably finishes killing old ones

* should properly shorten the ones that were done wrong

* maybe shrinks it now

* something went very wrong but i think we are back

* okay is this it

* silly ned

* what the flip

* balderdash

* Revert "balderdash"

This reverts commit 969dc70157342f60ac933f07e2d42eccd14f23e9.

* does like WAY too much stuff to describe

* ALMOST DONE

* ned you suck lol

* L ned + Ratio

* CONCLUDES THE GREAT DECAL-ENING

* few little tweaks

* HoP turnstile, as god intended

* remove free laser gun

* Fix Nukies P1: The Shuddle can drop (someone fix the flattening problems plz)

* Fix Nukies P2: Add plasma cutters and some plasma to the nukie shuttle

* gene wallmed 4 consistency

* fuck update appearance

* make bridge trims a ltitle better

* fuck this shit bro jesus

* i think i forgot this somehow idk

* fuck

* smart feller? no. fart smeller.

* makes engi and atmos way better looking trim-wise

* wait what if that's not actually true at all??

* plz work that'd be cool if it did

* i think this is right

* dumbass ned

* this might work idk

* plz

* Revert "plz"

This reverts commit c13270eb87.

* Revert "this might work idk"

This reverts commit 495db72813.

* Revert "dumbass ned"

This reverts commit cd59b84b9a.

* Revert "i think this is right"

This reverts commit 63a858aedd.

* Revert "plz work that'd be cool if it did"

This reverts commit b332d0f237.

* part 1

* ned is dumb

* part 2

* let me push this probably

* insignificant change to see if it fixes anything

* sick

* i deadass forgot to commit bro

* Revert "i deadass forgot to commit bro"

This reverts commit 986fa06991.

* Revert "Revert "i deadass forgot to commit bro""

This reverts commit 6d7bed5380.

* i hate this game

* n

* h

* h

* L

* cocaine

* that's important

* when you're here, you're family

* you suck eg ned

* starts working on this a little bit

* labor camp pt 1

* part 2

* sick

* it's done

* oops

* docking port

* kill the old one

* probably fixes pods

* finishing touches

* actual finishing touches

* touches up on a few poopy trims

* de-shittify tool storage

* why was this like that

* Aux base works now

* camra

* fixes everything

* a

* scrungularky

* gta 5

* lets see what this breaks

* unbreak the entire map

* does some stuff

* cool

* i think we are in the clear

* stuff, finishes stuff

* cool

---------

Co-authored-by: Byemoh <baiomurang@gmail.com>
2023-08-14 18:02:55 -05:00
John Willard
040129b303 Two-handed component (#19365)
* Adds twohanded and ports some things to use it

this will require update_appearance to properly compile.
Haven't ran updatepaths yet, I'm just saving my progress.

* Saving my progress again.

* Nearly finished

* Fixes

* test commit

* Revert "test commit"

This reverts commit 6e4e79a57a.

* existing base_icon_state

* base to atom

* Update twohanded.dm

* map updates and updatepaths relocation

* merge conflicts

* Fixes in local testing

* call parent

* fuck you admins have to wait procs out

* wielded stats
2023-07-23 22:49:39 -05:00
John Willard
9a89bb674f Adds update_appearance (this is friggin big news) (#19643)
* update icon and update appearance

* update name

* fixes

* Removes double parent calls from many things

* More fixes

* minor fixes

* fuck

* A!

* general annoyances in this PR

* going in specific fixes

* remove remaining update icons and hud fixes

* Mass replace update icon with update icon state/overlays

* compile

* push my work so far

* goes back on things I broke

* a

* goes through like 80 more cases

* going through more update icons

* compile again

* thank you tattax

* Goes through the remaining update icon

* fix CI cries

* Fixes cigs, canisters and guncases

* Fixes airlock unres sides

* Fixes the flash

* Fixes cryo cells

* gun fix

* Egun fixes

* fixes mini eguns

* Update energy.dm

* Fixes MMIs

* Fixes security level interface

* Fixes cigar cases

* Bow & Critter crate fixes

* Fixes signalers

* Fix canisters again

* re-adds blinking red

* Fixes solar panels

* Fixes cryogenics (and forced standing)

* Update cryo.dm

* sechailer fix

* Maybe fixes pitch black roundstart APCs

* Update apc.dm

* yet another egun fix

* Fixes plasmamen helmets among other stuff

* Fixes canisters for good

* Fixes booze dispensers

* Fixes new icon updates people added

* Probably fixes ballistic guns

* i give up lol
2023-07-21 18:49:04 -05:00
airlines7
70c40ba832 3 new and cool escape shuttles (#19430)
The drone mafia is now a thing and added it to one of the 3 new emergency shuttles.
2023-07-21 21:07:39 +00:00
N3D6
20e730df27 don't commit to master this time retard (#19337) 2023-06-24 15:39:14 -05:00
Cark
a09c798c08 aaaaaa (#19248) 2023-06-13 14:45:15 -05:00
Aquizit
5d3a4d4606 Fixes gax gulag shuttle but for real this time (#19211)
* fix

* let's make the pepper spray thing actually useable
2023-06-11 22:36:50 -05:00
Addust
d13d952381 Entirely redesigns the Listening Post (#18948)
* initial wip

guh

* GUH

* they can make vodka now

* trims a bit of fat

* guh

messes with post size a bit, gives them a soup sensors console so anyone raiding has to actually pay attention to their suit sensors to not get Fucking Axed

* Stop leaving the post bitch

* recarves the asteroid

* guh

* grav

* S

* guh

* fatter roid

* Maintbotany Final Version

* guh

* Shiv-class fighter recharger

* ducts are shit, sorry

* syndiCAT

* lights in engi

* terminal

* DECAL

* i dont wanna be flung when turning on the relay

* airalarm

* wait nvm one too many

* guhuhuh

* Maintenance External Airlock

* airlock roid dust

* baseturfs

* gibtonite!

* messes with how the post looks a bit

* bed

* a

* *swear

* atomizes the showcases because FUCK YOU

* Praeses is holding me at gunpoint. Send help.

* MORE BOTANY
2023-06-02 00:00:29 -05:00
ynot01
5afa876705 Update ruin_caravan_victim.dmm (#18868) 2023-05-17 21:57:50 -05:00
Aquizit
4da48bf166 adds fans on all arrivals shuttles (#18079) 2023-02-26 13:40:43 +01:00
Aquizit
19c1bb072d putting firedoors on one of the exterior doors that i forgot (#17440) 2023-01-12 22:35:00 +01:00
Aquizit
7ad9b0e62d New Triage Shuttle (#17034)
* File creation, basic structure, cryo system, uninjured passenger room.

* Layout testing, temporary

* design flaw fixes

* Final Construction

* Code for shuttle to be pulled and purchased.

* Blood and IV drip, Toolbox for Preternis/IPC mending, Plasmaman Supply Locker (locked to medical general access)

* I promise I can count and totally didn't misalign the bottom airlocks to the station.

* Last touches I forgot after having to change to redo the doors.

* Totally not me changing the smallest little thing (light placement) to get the checks to run again.

* Moved the firedoors by the surgery beds so if there's a breach it won't block access from the correct side as the computers are facing up.

* Defibs mounted ha ha I am such a bad doctor.

* Change the interior brig corner to no-diag to avoid lights floating in mid-air.

* Testing showed cryo system doesn't like the giant O2 tank. A can that needs to be wrenched it is.
2022-12-17 14:56:54 +00:00
00ze-cyclone
846c7f8253 Add at least a hundred carps to the white whale holy grail syndikit (#16783)
* Add a hundred fucking carps

Also a carp calling system to start a carp migration (3 times).
This is going to be the server killer syndikit I feel with all those carps but OH WELL TOO BAD IF THEIR SERVER WAS UNFIT FOR CARP'SIE'S GREATNESS!

* Make the trident fit on the belt

* Make the magspear quiver fit in pocket

It's also no longer a backpack

* Update uplink_kits.dm

* Update uplink_kits.dm

* Update uplink_kits.dm

* Update uplink_kits.dm

* Update whiteship_2.dmm

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2022-12-02 14:20:02 +00:00
Ezhan
448121e3cd freeminer ship fixing (#16724) 2022-11-28 00:33:45 -06:00
N3D6
2fb651ace5 why (#16636) 2022-11-23 15:41:05 -06:00
Bop
5c8030cc99 Ruin tech research bug fixes, and minor map change fixes (#16559)
* fix

* crzy

* fix runtime

* what if its not hop

* whoopsie
2022-11-19 15:39:39 +00:00
Bop
f761be7a15 [READY] Gives ability for free golem, free miner and delta station crew to research on a new research network, also minor tweaks (#16309)
* change

* e

* e

* thanks biomu

* done

* whoops

* up

* buff a bit
2022-11-13 12:21:14 +00:00
Vaelophis Nyx
cac865f1e9 Updates And Partially Redesigns Free Miner Ship (#16070)
* Update whiteship_miner.dmm

* Update whiteship_miner.dmm

* Update whiteship_miner.dmm

* Update whiteship_miner.dmm

* Update whiteship_miner.dmm

* Update whiteship_miner.dmm

* Update whiteship_miner.dmm

* Update whiteship_miner.dmm

* relocated that disposals warning sign because I'd never hear the end of it
2022-10-20 22:17:08 +02:00
Vaelophis Nyx
b4e5313c7d e (#16060) 2022-10-12 21:46:25 -05:00
Skrem_7
fba856e02f Adds Vxtvul Hammer without stupid conflicts (#15630)
* the thing that will actually work

* God bless you Tatax

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>

* smashes the errors

* in hindsight that code review was awesome as fuck

Co-authored-by: tattax <71668564+tattax@users.noreply.github.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2022-09-17 12:33:49 +01:00
Vaelophis Nyx
b01bf98336 Baseball Bat Rework + New Bats (#15555)
* initial commit

* commit 2

* commit three

* Update misc.dm

* Update misc.dm

* Update weaponry.dm

* Update weaponry.dm

* less OP

lmao

* only metal bats have knockback now

* black sprite

* twohand that bat

* fix the repath

* repath repath repath

* durability only goes down when you hit mobs

* sprite update

* wooden toolbox now

* Update twohanded.dm

* Update twohanded.dm
2022-09-17 12:23:21 +01:00
Redmoogle
1f54c67758 Makes whiteships spawn again (#15654)
* mapcode moment

* Update map_config.dm
2022-09-13 16:28:22 -05:00
Redmoogle
aebd92146d Whiteship is now random instead of map based (#15394) 2022-08-28 15:52:06 +01:00
adamsong
6499b4d2ed [MDB IGNORE] Comms console has smaller antenna (#15215)
* Built comms consoles only work on station

* Replace all mapped comms consoles with unlocked ones

* Make bibby happy
2022-08-14 16:08:42 -05:00
Vaelophis Nyx
04c41aff05 shazam (#15127) 2022-08-03 15:54:58 -05:00
Vaelophis Nyx
0967fd2566 a bangin donk on it (#15020) 2022-07-30 16:21:54 +01:00
nmajask
0fb400104a Ports hyposprays MK. II (#14814)
* cit hypos

* pain, suffering even

* maps too

* kilo as well

* delta fix

* syndicate hypospray + kit

* qmc sprite

* red crosses bad

* agh
2022-07-16 16:08:47 +01:00
Vaelophis Nyx
9c4dceeb8d Adds Fullupgrade Borg Charger Variant & Adds it to Nukie/Infil related maps and shuttles (#14795)
* adds fullupgrade borg charger

also adds it to nukie and infil ship and bases, and Rebee. Replaces normal variant where any existed.

* fixes the APC wiring on the infil cutter

noticed right after I opened the PR

* nevermind on clockies

they do not need this
2022-07-16 16:00:10 +01:00
Addust
9a378aab06 free miner ship changes (#14676)
Some minor QOL shit with the free miner ship.
Specifically:
Bridge now spawns with a fountain pen
The cargo bay O2 locker has 3 surplus pens (I couldn't find a better storage area)
The consoles aren't facing down at all hours so that it plays nicely with console rotation shit when the shuttle moves
Changed it to the passthrough turfs on the exterior because that was bugging me in mapedit
2022-07-02 16:38:44 -05:00
Skrem_7
677b440524 The Golden Age of Piracy (#14583) 2022-06-26 15:02:00 +01:00
N3D6
f8d55fec81 Adds the pool shuttle (#13788)
* Create emergency_pool.dmm

* makes pool

* fixes bitchass wall

* add firelocks to edge of the pool

* makes it actually purchasable because i forgot to push this commit
2022-04-22 17:14:22 +01:00
Byemoh
0a1dcf46fa day 1 (#13680) 2022-04-11 17:58:46 +01:00
Byemoh
d0f44e93d2 GaxStation, a new lowpop map that plays into being lowpop (#13493)
* options

* shit station 13

* Revert "shit station 13"

* on god

* Update ShipStation.dmm

* shipstation

* Update shuttles.dm

* Update ShipStation.dmm

* Update ShipStation.dmm

* Update ShipStation.dmm

* Update ShipStation.dmm

* Update ShipStation.dmm

* Update ShipStation.dmm

* Update ShipStation.dmm

* Update ShipStation.dmm

* Update ShipStation.dmm

* Update ShipStation.dmm

* Update ShipStation.dmm

* Update ShipStation.dmm

* Update ShipStation.dmm

* Update ShipStation.dmm

* Update ShipStation.dmm

* yep

* shit

* waa

* Update ShipStation.dmm

* Update ShipStation.dmm

* Update ShipStation.dmm

* Update cargo_gax.dmm

* removes dum files

* yes

* Update shuttles.dm

* Revert "waa"

This reverts commit 8defcf68fe.

* revert

* rename things

* forgot this file

* Update gaxstation.dm

* bruh

* Update GaxStation.dmm

* Update GaxStation.dmm

* Update GaxStation.dmm

* Update GaxStation.dmm

* Update GaxStation.dmm

* yep

* Update GaxStation.dmm

* Update horror_abilities_and_upgrades.dm

* Update horror_abilities_and_upgrades.dm

* Update GaxStation.dmm

* shuttle

* shuittle workrs

* Update GaxStation.dmm

* Update GaxStation.dmm

* Update GaxStation.dmm

* botanists get sandstone

* Update GaxStation.dmm

* Update GaxStation.dmm

* Update GaxStation.dmm

* Update GaxStation.dmm

* Update GaxStation.dmm

* Update GaxStation.dmm

* Update GaxStation.dmm

* Update GaxStation.dmm

* fixes jnmajakas shit

* Update GaxStation.dmm

* Update GaxStation.dmm

* Update GaxStation.dmm

* Update GaxStation.dmm

* Update GaxStation.dmm

* Update GaxStation.dmm

* eva APC

* fix atmos power

* robotech?? cool

* Update GaxStation.dmm

* keycard auths

* some RCs

* fixes ai solars

* holopads

* Update GaxStation.dmm

* Update GaxStation.dmm
2022-04-10 12:40:34 +01:00
LazennG
a4b392f936 new item for pirates: hand cannon (#13511)
* New tator item: Air Shoes

New 'air shoes'
-intended tot item for 4-5tc
-functionally wheelys that can ollie as well
-slight maneuverability in 0g just like moths

Co-Authored-By: Byemoh <5091394+ToasterBiome@users.noreply.github.com>

* things changed

-tried giving them the ability to ollie but botched it and idk how
-nvm baiomu told me

* Update scooter.dm

sparks appear on activation of shoes

* making it so if atmos is ok and gravity is gone yo can still move

* LAST THING DIDNT WORK

trying tje walk in pressurized thing again

* what do you MEAN UNDEFINED VAR

* stole from mothcode again instead

fuckin indentationerrors

* Update miscellaneous.dm

* fuck it dealing with this part later

* SPRITES BABEY

airshoes have proper worn/item sprites now

* changing shoe toggle sprites

toggling them on has its own sprite, but working on getting the ollie one to work properly

* Update shoes.dmi

* another shot at the movement in 0g

second attempt at allowing movement in 0g and atmos

* headache part 4

* Update miscellaneous.dm

* messed up vehicle sprites

added in icons for riding but sprites are a bit buggy atm, will replace later when replacements come in

* trying to figure out why a button wont change

* got it

no longer skateboard ollie

* just had a worse idea

gonna replace noslip with something else

* yes its dashing

* jorts

* jorts 2

* vehicle sprite

* last sprite thing

added custom sprite for shoe dash

* shoes can be renamed now

* Update miscellaneous.dm

* other actions now available+fixed sprite mistake

-removed a redundant line stopping the action from being recognized
-removed old shoe vehicle sprites so there's no shoes on top of shoes

* adds shoes to uplink and changes dash name

-alphabetically added to misc gadgets section
-name of dash changed from 'activate air shoes' so its less confusing

* Update miscellaneous.dm

* fixed a problem

walking while dashing used to just interrupt the dash so i just made the dash happen faster

* basic functions of hand cannon

* what do you mean cannonballs arent ninja stars

* cant have shit (pneumatic cannon) on yog so making it a gun

* changed cannon noise and am figuring out projectile knockback give me a minute

* knockback works now and cannonballs no longer tiny

* puts cannonballs and handcannon in pirate ship

* gets rid of extra rows

* what the fuck is a meter

* i cant even see if these work since my server wont start up

hoping they do tho

* why does this keep happening

Co-authored-by: Byemoh <5091394+ToasterBiome@users.noreply.github.com>
Co-authored-by: ToasterBiome <baiomurang@gmail.com>
2022-04-02 23:58:20 +01:00
Maxim
7cb0a04fc7 PORTS NSV POOLS FOR REALSIES THIS TIME (#13250)
* Merge branch 'yogstation13:master' into pools

* re-map pools

* fix luxury pool

* some more map changes

* spelling changes

* map changes
2022-02-12 18:28:40 +00:00
Redmoogle
7777795e16 Fixes smes charge levels (#12988) 2021-12-26 15:20:33 +00:00
DukeBobRoss
7ad1546707 Puts a recharger on the luxury shuttle (#12969)
* recarger

recarger

* better recarger

recarger but better
2021-12-26 15:10:36 +00:00
TheGamerdk
b685598df0 [AI] [READY] Minor AI Revamp Tweaks (#12919)
* Update decentralized_os.dm

* Update decentralized_os.dm

* Update decentralized_os.dm

* Update robot_upgrades.dm

* Firmware Boards

* Update ai_controlpanel.dm

* Update ai_controlpanel.dm

* Power balance

* Fixes some verb and HUD issues

* MMIs can hvae predetermined laws now. Start of RD password code.

* Finished RD code

Made AI revert to core if they're in a shell when it's getting attacked.
Fixed giving MMIs + posibrains laws

* Don't let oldstation use infinite boards

* Happy linter happy life

* Update robot_upgrades.dm

* Update ai_data_core.dm

* Update ai_data_core.dm

* Update ai.dm

* Moves defines to their own folder. Increased power usage and temp production for testing. Fixed air becoming "stale"

* Smoothing for expansion busses

* Malf upgrader

* UI tweaks

* makes it compile whoops

* makes it compile for real

* Lower temp limit

* Update ai_controlpanel.dm

* HUD fixes maybe?

* Plaque

* Update ai_controlpanel.dm

* MAPS

* kilo

* Update signs_plaques.dm
2021-12-25 09:33:33 -05:00
Lucy
84ff9c6d50 Infiltration game mode (#12270)
* Infiltrators!

* Fix the cigarette vending machine in the infiltrator base

* Uncomment role preference

* Fix a bunch of bugs.

* Changes to AI hijack

* GODDAMIT I FORGOT TO SAVE IN STRONGDMM

* Fix the dumb gravgen runtime.

* Just throw the infiltrator base on centcom directly

* Add infiltrators to one-click antag (and fix vampires not being in it)

* blame jamie

* add infiltrators event

* Admin only for now.

Admin only for now.

* Maybe fix the round ending a BIT too early?

* Fix uplink not appearing properly in the roundend report

* Improve examine text for infiltrator power sink

* Whoops, remove the J

* More stuff.

* Jamie's map changes

* Make the AI hijacker more idiot-proof.

* Update map again.

* fix infiltrators not being able to use edaggers

* Update centcomm map again

* aaaaa

* fix powersink examine

* e

* wait nvm that's right

* big typo whoopsie

* Some big ol' improvements!

* some tweaks to infiltrator uplink items

* Use span defines, some hijacked AI stuff...

* infiltration implants! woohoo!

* fix pinpointer to objectives not working

* dammit actually fix the pinpointer

* New pinpointer sprite!

* new sprites!

* Finishing all objectives no longer finishes the round.

* Fix sprite

* fixy fixy

* you can now put TC into your uplink

* restrict holoparas for infiltrators

* Fix infiltration implant creating a bugged implant case

* Fix CTF; add another infiltrator item spawnpoint

* tweak shuttle a bit

* you can no longer hijack dead AIs; 3rd item spawnpoint is now on the shuttle

* prevent using PDAs to metagame

* no removing purrbation

* hijacked ais can no longer doomsday; infiltrator objectives now properly respect quiet round

* make kidnap code slightly better

* show to ghosts

* remove cornered donuts in infiltrator ship

* fix up objective code stuff

* fix telecrystal thing still not working

* Add to config

* add minimum age of 3 weeks; add dynamic ruleset copy-pasted from nukies

* nvm i'm too lazy to figure out how this works

Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-12-04 17:42:36 -05:00
Maxim
9da1387f19 i fix freeminer kitchen (#12664)
* Update wheelchair.dm

* Update wheelchair.dm

* i save the day
2021-11-16 09:04:49 +01:00
Byemoh
3af753cf2a griddle it up (#12585) 2021-11-05 15:29:19 +01:00
Theos
26191754f1 Ports wounds from TG (#11955)
* piss

* second set of files

* theos feels pain and dies

* code works lmao

* other stuff

* YES YES YES

* Update zombies.dm

* egg

* whoops

* bubblegum alt attacks won't wound

* bone hurting juice hurts bones

* something's fucky wucky

* humans are no longer blue space babes but projectile damage is still wack

* IT WORKS???????

* other stuff

* turns out im big brain and already handled that should be testable live now

* WHOOPS

* medical pens not in stupid area

* fix regen mesh icons

* tool_behavior and defines plus allowing wound healing to override surgical tool no touchy bit

* should help

* mapping problem

* fix monkies shitting out blood all the time

* going to remove examine_more being stupid

* this is stupid i think it works though

* Empty commit, more bad code

* this probably fdixes something

* buckshot buffed back to where it should be

* woundings

* missed this one

* fix gamebreaking bug

* turns out damaging ANYTHING causes suit sensors to break whoops

* stuff up to limb disable refactor

* aid scanner can no longer kill you if you use it too much, preventing the robot uprising for another few decades

* Update burn_dressing.dm

* wtf

* shotgun slugs have a wound bonus of -30 putting them in line with other high damage weaponry that has even less

* burn debriding uses the scalpel rather than the hemostat

* debriding for patch/treat no longer causes wounds

* Give syndicate medical cyborg a bonesetter

* like 5 more prs ported

* fixes burn ointment and mesh application not having a progress bar

* gamemode zombies get easydismember and easily wounded

* managed to screw up self cautery this fixes it

* carbons can't use check self for injuries but humans can

* honey gives +2 sanitization to burns

* re-add this if sensors get fixed

* should fix a runtime I made on accident when trying to make examine more less jank

* last 2 prs and some holdup fixes since these touched on that

* set target = src so the progress par shows up i think

* Update mutations.dm

* fixes twohanded reuqired weapons by reverting some change I don't understand

* fixes blood sprites

* actually properly fixes the thing

Co-authored-by: Gabriel Adamson <adamson.g@gmail.com>
Co-authored-by: Jamie D <993128+JamieD1@users.noreply.github.com>
2021-09-11 13:19:11 +01:00
azzzertyy
f78dea8249 Adds Syndicate Stamp (#12258)
* adds syndie stamp

* final

* adds stamp to nuke base

* adds it to more maps

* fixes sprite

* edited sprite

* Adds to uplink

* bad name fixed

* makes syndie & chameleon stamps turn boxs into syndicate boxes
2021-09-07 22:36:06 +01:00
Lovebird-Frungy
b6db584304 Miningbase Rework (#11425)
* Mining Base Rework

Here is the core of the pr.
New miningbase layout
New mining shuttle layout
New areas and reworked area names
New area sprites

* Sign Fix

Fixes the mining signs (y:-32 to y:32)

* More fixes

Adds a few firealarms and fire extinguishers i missed.
Adds four windows, one in the processing roome, one in the bar, two in the vacant room. Other machinery have been moved accordingly.
The bookcase not working, replaced with a pajama wardrobe with plushies!
Opacifies the recovery room door for privacy.

* Adds some decoration, vents and rwalls.

Adds one vent and one scrubber.
Adds posters and a few new newcasters to the base and the shuttle.
Makes the tcomms walls reinforced like the old base.

* Portable Scrubber!

Adds a portable scrubber to the atmos room!

* fixes and tables

* Minor Changes

Adds a random book to the recovery room.
Adds some dirt and oil to processing.
Adds a medical mask to go with the anesthetics tank.

* Minor Tweaks

Adds three holopads (Lobby, Break Room, Infirmary)
Adds a book to the dorms.
Changes the mining medic locker contents themselves, additionally adding a crew pinpointer.
Moves the shuttle poster.
Moves wall mounts around.
Moves the morgue window to make it accessible in order to interact with its curtains.
Opacifies the morgue window.
Changes the vacant room door to engineering colors.

* Reverts

Reverts some stuff, to start over again, hope this works.

* Cosmetic Changes

Changed some decals.

* Maint Door Change

Adds the abandoned helper to the forgotten door.

* Closet: the lockerening.

As per feedback, upgraded the closets to their own kind of personal closet.
Secwear vendor changed into secure contraband locker.

* Closetor IV: Retribution (Part 3 of the war of the decalums decalogy)

Adds (src) to the new crate code’s ( as per SomeguyManperson’s advice, thanks to them, this pr is less of a mess!).
Adds some decals (deathsposal caution, portable atmos placement, and smes floor).

* First Aid 1.23: Life, Death, Tea and Biscuits.

Adds an emergency medical crate to the infirmary. 
Containing a first aid kit, a toxin kit and an oxyloss kit.
Also swaps an ore box for symetry.

Co-authored-by: wejengin2 <48154165+wejengin2@users.noreply.github.com>
2021-08-17 19:14:37 +02:00
wejengin2
54d7ad9f45 window (#11843) 2021-07-24 11:59:09 +01:00
adamsong
201d345c2e Give free miners access to mechs and borgs (#11673)
* First pass at giving free miners some mech/borg access

* Fixed some things, removed the firmware hack from the exosuit fab and put it on the free miner ship

* Removed newline from file I ended up not wanting to change
2021-07-01 11:36:34 +01:00
wejengin2
757e9ff409 [Bounty] Kilostation (#11413)
* basics

* shuttles yogged

* create kilo

* yogization complete

* pets,heads,holodeck,fixes,pipes,asteroid,areas,clerk,comms

* fix basemap

* temporarily adds tg kilo for ease of portage

* atmos expansion

* compatibility fixes on tg temp version

* some random maint

* minor

* first test fixes

* more fixes after ingame tests

* more fixes smh

* new pods

* remove tg

* helmet

* Update code/datums/shuttles.dm

Co-authored-by: Hopekz <hopekxx@gmail.com>

* testmerge fixes

* more testmerge fixes

* testmerge round 3

* arrivals again, smes, whiteship fix,things

* testmerge fixes round 5 i think

* some pipes and arrivals again again

* minor thing

Co-authored-by: Hopekz <hopekxx@gmail.com>
2021-06-13 11:17:20 +01:00
Theos
1c5c6034c3 fixes escape pods probably (#11420) 2021-04-27 09:34:19 +02:00