Commit Graph

3684 Commits

Author SHA1 Message Date
Redmoogle 3be5ca8676 Charlie Station Redesign/Rework (#45838)
* Charlie Rework

* Charlie Rework Extra Fluff

* .slap MapDiffBot

* Stop being stupid MapDiff Bot

* you too travis

* Adds a extra set of o2 tanks, adds some more rust, and fixes 2 solar panels already being prebuilt

* Adds a few more meteors and general fixes

* Mining Area for Charlie/Beta Added

* Charlie Station Mining Area

* General fixes

* Beta Hallway is longer also puts stuff into more proper places

* Fixes a 1 tile fuckup

* Fixes bad wall placement and also hallway doors

* Removes out-of-place plants oops

* Adds extra areas for charlie

* Changes the threat

* Removes gas miner and general fixes
2019-08-17 23:47:18 -07:00
Mickyan a5b04e360c Adds more persistent photo albums (#45898)
* album

* more slots

* new icon for old photos
2019-08-17 00:42:58 -07:00
Rob Bailey 93fcc59ae5 adds missing bomb site area on donutstation (#45950)
* song for this fix: Bobby Darin - Dream Lover

* mapmerge
2019-08-17 00:35:34 -07:00
tralezab fe148785cc song for this fix: Little Eva - The Loco-motion (#45951) 2019-08-17 00:34:12 -07:00
tralezab d0d239cd88 maybe maybe maybe (#45949) 2019-08-17 00:32:02 -07:00
ShizCalev ffe967f7e5 Removes GPSes from Deep Storage and the Caravan Ambush (#45906) 2019-08-15 18:00:59 -07:00
tralezab 3b13d64dce mapmerge 2019-08-15 17:16:36 -07:00
tralezab 682b25b30c song for this fix: Bobby Darin - Dream Lover 2019-08-15 17:14:16 -07:00
Dawson1917 39d65102af Removes GPSes from Deep Storage and the Caravan Ambush 2019-08-14 10:42:57 +09:30
Narcissisko fd070e3ae2 Adds a new luxury bar capsule to the miners vending machines which cost ten thousand mining points (#45547) 2019-08-08 01:07:20 -07:00
Rob Bailey ed178d6484 dab on them assistants (#45651) 2019-08-06 20:12:56 +02:00
Rob Bailey 0c6fabceb0 Merge pull request #45680 from 81Denton/unfuck_c4
Refactors C4/X4
2019-08-05 19:09:57 -07:00
ishitbyabullet 71277af9d3 Improved Cabin Away Mission (#45618)
* The map itself

I hope it won't PR on /tg/station immediately.

* ok lavaland monster dmi thank you

"bruh you added two sprites oh shit im about to m-m-m-malfuncti-" *BOOM*

* cabin building stuff

Still need to merge master.

* Ninja's uniform PR got merged.

Good thing I used, like, only one jumpsuit for the entire map. I hope this merges before someone changes winter coats though.

* lmao

* MrDoomBringer forgot a few things

obj/iced_abductor. that's an ayy lmao moment.

Besides that, the block should work. Just don't destroy it before the round begins otherwise you see this: https://i.imgur.com/K3GGnqy.png

Proof that this works: https://i.imgur.com/MxVO0Og.png

* no more claustrophobic medbay

It doesn't look as good as I want it to. It also feels way too fucking cramped.
2019-08-05 01:37:11 -07:00
Rob Bailey 2c720c6408 No ID insertion for everything except the hop console (fixes the ORM) (#45693)
About The Pull Request

machines and consoles that previously required an inserted ID now check access on worn and inhand ids. They otherwise function identically.
Affected things:
ORM: click claim to claim cash to connected ID (also fixes it)
Mining vendor: uses ID on person or in hand.
medical console: checks worn ID
security records console: checks worn ID
gulag consoles: claim points to worn ID, checks access and point requirements from worn ID

Also some backend refactoring to prisoner management and gulag teleporter consoles

hop console will be next to strip out the shitcode entirely but this at least gets things functional in the mean time, but fully tested this time. It's very late here and I need to sleep. Due to the nature of it it's more elaborate of a rework.
Changelog

cl
tweak: Medical and Security consoles now check access on worn or inhand ID instead of requiring an inserted ID
tweak: mining vendor now reads from ID in hand or on person instead of requiring an inserted ID
fix: ORM is functional again (for real this time)
tweak: ORM claim points button transfers points to worn/inhand ID instead of to an inserted ID, no longer accepts insertions
tweak: Same for gulag consoles
/cl
2019-08-04 22:53:55 +12:00
Rob Bailey 42dd63c5c3 Pubby SM Rework (#45399)
About The Pull Request

Relayouts the pipes on the pubby sm
image

Tested and ready to ass blast
Why It's Good For The Game

Makes it better
Changelog

cl
tweak: A more up-to-date version of the supermatter unit has been deployed to pubbystation
/cl
2019-08-03 14:46:20 +12:00
SpacePrius 361bbd3e73 Sec vendor on gulag now has ID and Cost requirements (#45466)
* makes it so the sec vendor actually works on gulag

Signed-off-by: Space Prius <bubba041102@gmail.com>

* lets see if this fixes it

Signed-off-by: Space Prius <bubba041102@gmail.com>

* minor changes.

Signed-off-by: Space Prius <bubba041102@gmail.com>

* modifying logic

Signed-off-by: Space Prius <bubba041102@gmail.com>
2019-08-02 17:05:38 -07:00
Denton d98df6e063 Refactors plastic explosives
y
2019-08-02 22:31:05 +02:00
Akrilla c9a5892728 Removes front two Metastation medbay showers (yes those showers) (#45498)
About The Pull Request

Moves the shower from medbay lobby, and the shower beside the inner fridge. We now have an added shower to the top of the stasis bed room, with a shower replacing a glass table inside chemistry as well. No items in chemistry have been removed, but the tables at the top of stasis beds have, paper bin, folder, stethoscope etc.
Why It's Good For The Game

For a department dealing with critical patients coming in, and time being just as critical, it's a bit counter initiative to basically have two permanently slipped tiles in an already narrow corridor. Literally whenever going to medbay I'll see at least one person slip every single time. I've seen people coming into medbay by slipping first on the outside shower, only to slip again on the inside one.

The number of showers are still the same, and the stasis bed room also feels a lot more open. Chemistry has a shower for any weird mishaps that may happen, and there's still showers to treat rads etc. There's also an added fire extinguisher at the front of medbay to offset a bit of the missing fire prevention.

Also this is my islipped pr after slipping on these tiles for the 1000th time as CMO and ranting about it for 5 minutes in front of the staff...

Shower area:
image

Chemistry shower + removal:
image
Changelog

cl
add: Adds a shower area to the top of Metastation stasis bed room, and adds a shower inside chemistry.
del: Removes the lobby, and outside chemistry shower.
/cl
2019-08-01 21:06:25 +12:00
Rob Bailey 3f36f14ba4 Merge pull request #45587 from nemvar/3seashells
Adds three seashells to charlie station.
2019-07-31 02:44:59 -07:00
Rob Bailey 6a26744d83 Clothing /under repath (#45548)
About The Pull Request

repaths clothing/under to be more sane
Also fixed a couple of bugs relating to pathing being incorrect, and modified a couple of bad descriptions and names
Also adds a map path updating script, which also helps show the full repath.
Why It's Good For The Game

improves maintainability, makes mapping easier, stages for a clothing dmi split
Changelog

cl
refactor: repathed all under clothing, keep an eye out for errors
/cl
2019-07-30 19:20:21 +12:00
tralezab e94b6139cf Fixes some issues with balloons (#45554)
* Ok, this was just embarrassing

* uno

* dos

* tres

* cuatro

* wait, these vending machines are crazy similar...?
2019-07-29 18:51:41 -07:00
zeroisthebiggay 4881425750 minor box fixes i missed in last pr. (#45541)
* yikes.

* map merge exists hell.
2019-07-29 18:50:37 -07:00
nemvar c9038d404d Adds the three seashells. 2019-07-29 18:17:04 +02:00
RandolfTheMeh 48fbc073e5 [TMC] Defib Rework, Organ Damage Effects (#45104)
* Brain damage works on organ damage procs, some defib reworks

* Heart and Lung damaging effects and failure, liver damage and failure moved to its organ again

* Cleans up reused global

* Organ damage procs on living and living/carbon

* Changes brain damage procs again

* SR heals all organs on revive, no decay for cybernetic implants, stomach damage and fail effects.

* Damage and failure effects for the appendix, ears, and some touchups on the stomach

* Committing changes so I don't lose them

* Organs now cease decaying in the proper containers

* Organ Fridges

* Reverts map changes

* Adds coronary bypass, lobectomy, trying to deal with organ_stat runtime

* Actually fixes merge conflict

* Smartfridge tweaks

* Think I figured out map merger

* Evidently not

* Still runtiming with glass shards even after I remove the map changes?

* Fixes runtime error with brain_item

* Runtime fix on living/carbon/life

* Cleaning up old PR code

* Brain damage fix, moves defines to actually be in _DEFINES, under DNA since that's where organ slots were

* Wrong math operation used

* Brains in MMIs no longer decay

* Removes redundant variable, and defibs no longer work on heart attacks caused by failing hearts

* Removes misleading comment

* init freezes organs in case organ crates are added, morgue corpses are frozen, removes adjustLiverLoss

* Removes random spaces, scanners check brain damage severity now

* Swaps numbers for defines, fixes brain surgery, rebalances coronary bypass bleed since that was insane last I tested it

* List change

* Runs off of an index instead of using cut

* Brains can be put into organ fridges

* Fixes minor type, hotfix for cloning problem

* Removes pointless check

* Demon hearts no longer decay

* Nightmare hearts no longer decay

* Removes istype() check on process, sets can_decompose instead

* Condenses organ damage report

* Removes organ failure messages

* Less organ damage spam, implements organ threshold messages instead

* Brain damage messages go to owner, not source

* Self-examine shows damaged organs

* Minor code cleanup, adds autodoc comments to the new procs

* Inverts standard organ vars to prevent random organs decaying, adds a few more autodoc comments.

* Merged the booleans into a set of flags

* Healthy living improves organ healing rates

* dunno why this didn't update

* my actions have consequences

* Sets ORGAN_SYNTHETIC for overlooked robotics organs

* Doubles heart decay time

* 3 minute heart decay

* Lobectomy/Coronary_Bypass heal more

* removes hivemind spells from the changes
2019-07-29 02:18:22 -07:00
Garen Crownguard e851b6550a Cult hoods can be toggled (#45497)
* Cult hoods can be toggled

* oops
2019-07-28 05:00:50 -07:00
Deepspacenoises d16a0803f3 fixes my fuckup round 2 (#45486) 2019-07-27 20:18:48 -07:00
SpacePrius 18638f21c3 moved some wiring around in engineering (#45467)
Signed-off-by: Space Prius <bubba041102@gmail.com>
2019-07-27 02:45:43 -07:00
zeroisthebiggay 3eecc0b4b6 A couple fixes and quality of life changes to Box Station. (#45233)
* box stations fixes and quality of life.

* oops

* more oops

* fuck that one locker in the ai sat.

* even more fixes...

* steps.

* decals.

* decals.

* autism box.

* bruh moment.
2019-07-27 00:02:22 -07:00
tralezab 64550884fa [READY] Ian's Birthday Holiday (#45356)
* ian's birthday

* missing )

* hop shirt + bday cake is on front desk

* confetti 1/2

* confetti 2/2

* corgi balloon, hop gets a knife to cut the cake

* forgot knife + inhands + mapping

* oranges review, old var removed

* oranges request ;)
2019-07-25 23:23:53 -07:00
SpacePrius 06288db602 Fixing Delta Ticket Counter (#45418)
* Fixing Delta Ticket Counter

Signed-off-by: Space Prius <bubba041102@gmail.com>

* actually doing it properly

Signed-off-by: Space Prius <bubba041102@gmail.com>

* fixing travis having a stroke

Signed-off-by: Space Prius <bubba041102@gmail.com>
2019-07-25 14:08:13 +02:00
nicbn 44a07d712d BoH bombing rework II (#45174)
Ever since the big BoH nerf, BoH bombing is kind of a joke. The damage it does is not really huge, and it's lame for traitors - it lacks emotion and their target may not even die, as they can use the ladders to get away.

So, what this does is add back some soul into BoH bombing, while not making it too round-ending and adding some degree of damage control for admins in case of griefing.
When BoH bombing, a stationary singulo with custom sprite will spawn. Its gravitational pull is REALLY strong, so people near it are probably going to get eaten, and there will be some real damage to the hull. The singulo will cease existing after 5 seconds.

For antags, I think this becomes much more interesting than the current BoH bombing. In the case of griefers, the damage to the station isn't too big because the singulo is stationary and fades away after some seconds. And then, admins can click a button in their chat to bring back everything the singulo ate into the game (the button expires in 10 minutes, however, but this can be changed if you think it is needed).

Settings like gravitational pull can be tweaked if yall find it to be too strong or something.
Changelog

cl
tweak: BoH bombing changed again. Now it's more violent.
/cl
2019-07-25 21:18:01 +12:00
81Denton c4934aa959 Replaces snowdin gas miners with gas turfs (#45409) 2019-07-25 02:15:21 -07:00
oranges b7960dd0d3 Merge pull request #45383 from nemvar/syndicakes
Fixes gamebreaking syndicakes bug.
2019-07-24 16:04:37 +12:00
nemvar d43adb0dc7 FIXES HUGE HUNGER PROBLEM 2019-07-23 02:29:20 +02:00
TheChosenEvilOne ebbcda1407 Fixed the PDA messaging servers on box and donut 2019-07-22 21:12:53 +03:00
tralezab 3b49b5378d Yet Another Fugitives PR: Bounty Hunters, Features, Fixes, Treason, Removals! (#44802)
* mostly fixes in this commit

* removes old_god from the dme

* russian shuttle improvements

* TODO: fix the hook gun

* shotgun finished, next commit shuttle

* bounty hunting shuttle

* back up to speed on the dmis

* readds poster 46 and adds the shuttle finally

* dmi fixes

* traps need fixing, work out whatever is happening with synths

* super final touches, see desc

map ports + proper spawners, pinpointer and traps functional. other misc changes

* removes verb stuff from non verb stuff

* review (see desc)

antimagic checks and it now the two objects move inside each other instead

* dmi conflicts

* PLUNGERS. BEGONE.
2019-07-22 20:00:34 +02:00
ShizCalev 067b554e7c Merge pull request #45323 from nemvar/pubbymapissues
Fixes some map issues on Pubby.
2019-07-21 18:38:22 -04:00
nemvar f209bd1d3a Cleans up a dirty var 2019-07-21 15:50:22 +02:00
nemvar 5c1b77cf8c Mabbit 2019-07-21 15:48:29 +02:00
nemvar e3bafd645c People have told me to write better commit messages. (#45281)
This removes a unneeded light from box station virology. It didn't used to be there and is now gone again. Where did it come from? Where did it go? Where did it come from? Cotton eye... lightbulb.
2019-07-21 02:05:35 -07:00
MMMiracles 353457f7d5 Donutstation Tweaks (#45250)
About The Pull Request

    Fixes #45077
    Fixes #42498
    Removes every single instance where a grille could end up on top an active wire in maintenance, making traveling maintenance a lot less of a hassle and less dangerous in general.
    Maintenance bar has been removed due to redundancy and closeness to the actual bar. Wait till season 10 of SS13: Battle Royale to find out what exciting changes will come to the map!
    Space-proof variants of the lizard critter has been added and are working diligently on the above-mentioned bullet-point.
    As part of the white shuttle fix, Donutstation now has a custom shuttle with deep l o r e to explain what happened to the long-past crew.
    Small adjustments to the static loot part of the 'excess storage' rooms near departments.
    Some extra crates has been added around maintenance with respective maintenance loot spawners.

Why It's Good For The Game

Bug fixes relating to the map and some added map content to keep things 'fresh'.
Changelog

cl MMMiracles
add: Donutstation now has its own white shuttle with proper dock.
del: Donutstation's maintenance bar is under renovation.
tweak: Due to above renovations, the goose is temporarily loose.
tweak: Donutstation now has significantly less annoying maintenance grilles
/cl
2019-07-19 23:11:57 +12:00
Rob Bailey bfb6cf01bb Refactors shield wall generators (#45221)
* migrates the shield generator to the powered typepath

* map update

* fixes wire unsecuring weirdness

* this should go here actually

* minor reformatting + documentation
2019-07-19 08:05:57 +02:00
Deepspacenoises cd59c8e4b7 Lavaland Syndicate Base fusion (#45234)
* henk

* Syndicatelavalandupdates

* Added some rad collectors and moved some stuff
2019-07-18 20:38:15 -07:00
Dennok 1b165b26d1 Bluespace Navigation Gigabeacon (#44807)
About The Pull Request

This PR add "Bluespace Navigation Gigabeacon" that shuttles can use as a target for the jump computer.

You can customize locked status by multitool or name of beacons by multitool with unscrewed beacon.
If you, or emp, lock beacon you are still able see it in choice list like a "Locked" destination, but unable to jump to it.
Why It's Good For The Game

Now any spacemen can construct their own Space station on any Z lvl (that not reserved, centcom, away mission) and dock (by custom dock) his ship to it.

Now we actially have some shuttles that have ability to place custom dock.
That one is whiteship, but only if its not UFO, 4 ships in caravan ambush(for 2 need sindycate access), +1 for nuclear ops(sindycate access), but dont forgot that Admins can spawn "navigation computer" to any shuttle.).

Lavaland safari likers now can land anywhere where they can fit a ship, on lava, basalt, and plating turfs, also asteroid.

I drop some bombs to clear spot and land to lavaland.
http://recordit.co/qN10qfuift

Here i create dry dock near station and dock ship into it.
http://recordit.co/R4kXqN8rnt

all walls and other floors are forbidden to prevent you landing on the station

possibly more random gibberish?)
maybe change plating to reinforced (engine) floor.

Navigation computer now use trait blacklist to filter out z levels to where it can't place custom dock.
This make easy to add new z lvls where it can place dock.
2019-07-17 13:58:57 -04:00
actioninja 88c485c891 fixes an incorrect area on donut 2019-07-16 00:27:19 -07:00
Redmoogle 8ecc4d24c2 Improving upon the Metastation bar design (#45169)
* Ok Work Redone

* Airalarm & Firelock moved, Windows added, newscaster added

* Puts the preperation table in a better place

* Adds a extra table and swaps for r-tables
2019-07-15 19:55:11 -04:00
MrFluffster cdc48ee163 Mining Base Changes: Less empty office, more stuff, stuff that used to be is back (#45166)
* Changes to Mining Base to make it better, brings back the old storage closets

* Yes

* Changes lockers to locked, labels the cameras correctly

* does what cabby wanted

* fixed an oopsie
2019-07-15 19:52:13 -04:00
nemvar a3a5cf647c Replaces the slime extract in the clown biodome with a superlube sprayer. (#45134) 2019-07-15 10:10:38 -04:00
Kmc2000 bc2a238748 Gives the HOP a ticket machine (#45095)
* Adds a ticket machine to the HOP's office so you can keep track of unruly hoardes of greyshirts while giving the clown all access.

* Fixes a logic error

* Whoops

* Idiot proofing

* Pt 2.

* Me make code less shit

* Fixes more badcode
2019-07-14 02:15:54 -07:00
Hulkamania dcc9065fd4 Add a new Emergency Shuttle, Transport Zeta (#45100)
Adds a new abductor themed shuttle to the game, available for 8k 
credits! The shuttle is only unlocked after alien technology has been 
researched!

The shuttle offers some unique items and layout compared to others 
currently available. Two singular entrances with the brig in the back 
means security needs to walk prisoners to the brig area to secure them. 
Unique unlock mechanism encourages either bringing alien tech back from 
Lavaland or stealing some from an abductor.

A few unique items aboard, including alien tools, the experimental 
cloner, and a void core can provide interesting opportunity if utilized 
in the window of time that the shuttle is on station.
2019-07-13 19:58:13 -07:00