Commit Graph

2835 Commits

Author SHA1 Message Date
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
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
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
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
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
zeroisthebiggay
4881425750 minor box fixes i missed in last pr. (#45541)
* yikes.

* map merge exists hell.
2019-07-29 18:50:37 -07: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
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
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
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
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
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
skoglol
9c9df48276 Better conscription kit, public lavaland mining vendor (#45089)
* Better conscription kit, public lavaland mining vendor

* no includes plx

* Removes pickaxe, adds seclite.

* Removes the cargo crate.
2019-07-11 20:55:52 -04:00
Jordie
8a3078ee7b Merge pull request #44967 from actioninja/dirtyvarcleanup
Cleans up dirty mapping var edits.
2019-07-10 22:43:38 +10:00
Jordie
c2f856d701 Merge pull request #44995 from StonebayKyle/viro-scigoggles
Adds science goggles to virology lab
2019-07-10 22:34:51 +10:00
actioninja
169a974b6c map vars cleanup 2019-07-09 21:29:08 -07:00
nemvar
5b4c97a5ce nerfs cakehat for realsies (#45001)
* nerfscakehatforrealsies

* whoopsie doopsie

* Adds Potty the plant

* microwave the cake
2019-07-08 23:26:21 +10:00
Dennok
9069855e3f Add drydock to runtimestation. (#45013)
* Add drydock to runtomestation.

To show work of the shuttle landing mechanics.

* Add some lost cable to runtimestation.
2019-07-08 22:59:33 +10:00
oranges
d8a3af332c Merge pull request #44961 from SpacePrius/addcopymachine
Add Copy Machines to HoP office
2019-07-08 21:50:01 +12:00
DESKTOP-4OJ997G\Kyle
d710574eef Adds science goggles to virology lab 2019-07-05 08:06:31 -06:00
Krysonism
ffe578aacb [READY]Replaces Trekchems with Cobby Category 2 Chems + Chem Tweaks (#44531)
* Adds adjustLiverLoss & getLiverLoss procs to carbon

* Adds trophazole

Adds trophazole, a brute healer that makes doctors take a more holistic approach to heal, It is highly reagent efficient by converting nutriment to healing peptides. Creates an avenue for cooperation between kitchen and  medbay.

* Adds rhigoxane

Rhigoxane is a chilly burn healer that works best in a spray bottle and is capable of extinguishing fires.

* Adds thializid

This tox healer has great potential and mixability, balanced by requiring the doctor to take note of the patients liver health as well as using proper dilution and an iv pole; that wont fit in a powergamers pocket.

* Charcoal  + trans_to changes

Makes charcoal only work when ingested, and adds a new proc in reagent holder, lets trans_to react the transferred reagents if a method is chosen.

* Medical + Syndicate spray bottles

Medical spray bottles have been added to techweb under the biotech node for medical vapor application, alt click to change their skin.
Two suspicious spray bottles have been added as expensive contraband items in the chemdrobe. They have one extra spray range and a random suspicious skin from a pool of 8.
The large spray bottle and the space cleaner bottle also have new icons.
In addition trophazole and MMF have new colors.

* Adds chempacks

the IV medicine bag, or chem pack is the blood pack analogue for chems, it is easy to fill like a beaker but can also be permanently sealed to prevent spillage and mitigate tampering. It can be renamed with a pen. Both the new chem pack and the old blood pack have been added to the medical lathe and biotech node.

* Adds recipes to thializid and trophazole

Also fixes the rhigoxane recipe

* Medsprays are now medigels + fixes

chem packs can now be stored in the smartfridge and chem bag.

Medsprays were renamed medigels to reduce confusion. Calling them medical sprays made no sense since they apply chems through the patch method. 

The lore for the new medigels  is that they spray a thick gel onto the skin that dries into a film.

* minor fixes + mint frosting

I have tried to fix the problems people have pointed out. And the peptides now taste like mint frosting.

* Readds my cleaner sprites

* Adds liver damage to thializid + adds on_transfer proc

Thializid has a liver cost, the cost is worse if you have already sustained liver damage. Fixes weirdness by moving the reagent conversion effects from reaction_mob to on_transfer

* Fixes chem bag examine

The chem bag examine now werks, also fixed a typo in the description.

* Adds a clumsy check to sealing the chem pack

* Makes kelo, bicard and anti-tox unmixable.

I have retained the tricord recipe for now in case someone manages to collect all 3 through non-dispenser means. Think of it like collecting all the dragon balls but lame.

* Makes damp rag apply on_transfer effects

* glass and food now work with trophazole

glasses and food now call the on_transfer proc via trans_to

* Another round of fixes

Replaces 0/1 values with TRUE/FALSE where appropriate. Removes the debug printout from the spray bottle reskin. Replaces one instance of L.damage with C.GetLiverLoss().

* Rhigoxane recipe is now COOLER

200k was too warm since cryostylane cools down so much by itself upon mixing. 
Now the chemist has to choose between adding oxygen for instant cooling or using the heater/cooler to conserve energy.

* Removes the seal() proc and moves its guts into AltClick

* Item_state switching moved to reskin_obj

* Fixes missing medical sprayer left inhand

the sprayer_med_yellow inhand sprite now has the correct name.

* Fixes inhand updating

* Update code/modules/mob/living/carbon/damage_procs.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* Update code/modules/mob/living/carbon/damage_procs.dm

Co-Authored-By: moo <11748095+ExcessiveUseOfCobblestone@users.noreply.github.com>

* Tries to add typecache

* Moves the typecache and makes it static
2019-07-05 09:50:59 -04:00
Rob Bailey
3dafee22d2 Fix minor Metastation issues (#44952)
Fixes a disconnected APC on the Metastation AI satellite.
Also fixes a very minor area error.
Adds a scrubber to the Meta engineering lobby.
2019-07-04 22:00:00 -07:00
WJohn
bbf97558cf Move Boxstation SMESs back into engineering (#44844)
With the advent of smartcables I felt it inevitable that I'd have to
revisit Boxstation's SMES room. It's always been this needlessly ugly
and separated mess that no other station does, and so this brings it
in line with all of those.

Prettier, more compact, works nicely with new cables.
2019-07-04 19:26:26 -07:00
nemvar
a2af00a933 Fix unpowered air injector to space in Delta incinerator (#44957) 2019-07-04 13:31:43 -07:00
Nick
a8197eb3dd Citations (#44853)
* Citations Step 1 - New Datacore Stuff

* Committing before merging with master

* Initial work on PDA messaging

* Adds support for automated PDA messages

This is just a flag that, when set, replaces the standard (Reply) href with a static "automated message" message

* Citations now generate PDA messages

The target of a citation will be notified via PDA message

* Escaping some non-optimal characters in PDA messages

* Creates a public warrant computer

Initial framework. Computer machine and circuit. Adds it to the DME.

* We're gonna flipflop on this for a while

* Removing unneeded functions

This is a read-only terminal, so we don't need to have all this code for managing entries and updating fields

* Whoops

So this is why byond was warning me about unused vars

* Need some help

Pushing this commit because I got this into a state where it doesn't work right

* Adds support to pay fines!

* Map changes. Adds a warrant console to the hallway outside the brig and law office on Box.

* Adds some checks to fine creation

* Aaaaand more work on paying citations

* Paying citations works! The money goes into the defense budget!

* More functionality and usability changes

* Adds warrant consoles to the rest of the maps

* Cleaning up text

* Rewrote warrant computer to be more up to date.

* Fines are capped to 1000 credits

* Requested changes

* Citations can now be paid with holochips and warrant consoles don't require your ID to be inserted.

* Fines can be paid from security record consoles, and more feedback messages

* Citation payments now actually go into the defense budget for real

* Removing even more unused code!

* Removes unused code (emp_act and ID handling)

* More unused code for the unused code gods

* ID card reference is now just fetching attached name.

* remove simple mob typepath kthx for the remove simple mob typepath kthx gods

* one usr, many M
2019-07-03 20:19:05 +02:00
Space Prius
d9ac398516 Photocopy
Signed-off-by: Space Prius <bubba041102@gmail.com>
2019-07-03 10:36:37 -04:00
81Denton
231631d2f2 Fix more minor Donut and CentCom map issues (#44909)
The donut AI chamber SMES was missing a cable underneath it; that way,
it wouldn't connect to the local APC.

CentCom vault is now secured by the old vault door plus indestructible
shutters that can be removed or opened by admins. In case someone uses
one of the 314432 exploits to get to CentCom, I made the ERT shutters
indestructible and replaced the all access IDs with a box of ID cards.
2019-07-02 16:44:34 -07:00