Commit Graph

3457 Commits

Author SHA1 Message Date
MMMiracles
595cf643f6 Merge branch 'master' of https://github.com/tgstation/-tg-station into 1storydonuttweaks 2020-01-02 17:41:31 -05:00
TheVekter
da2b817e44 [READY] Moves Genetics to the Science department and makes Gen… (#48397)
* great googly moogly it's all gone to shit

* Fixed geneticist ID, moved in job list

* This is what I get for not building

* Fixed HUD sprite

* Finalized move to R&D code areas and updated sprites

* Mapping fixes on Meta

* Boxstation's turn and some Meta fixes

* Fixing map conflicts

* Moves genetics to science

SQUASHED:

great googly moogly it's all gone to shit

Fixed geneticist ID, moved in job list

This is what I get for not building

Fixed HUD sprite

Finalized move to R&D code areas and updated sprites

Mapping fixes on Meta

Boxstation's turn and some Meta fixes

Fixing map conflicts

* lmao travis

* okay you can pass travis this time

* DeltaStation changes

* lmao access bullshit

* Kilo also a few code/sprite fixes

* Pubbystation

* Removed gondolas because people hate fun
2020-01-02 06:15:35 -08:00
MMMiracles
d664a89385 plumbing room, extra cameras, disposals fix, new department sign 2020-01-01 14:41:28 -05:00
Len Kagamine
9c12f62c53 Adds Instruction description to transit tube pods. (#48460)
Adds a simple "Could be dragged into an open TT" instruction on how to use them.
2019-12-30 17:49:14 -05:00
81Denton
632094e557 Adds directional stair subtypes, fixes missing icon states (#48400) 2019-12-27 10:35:07 -05:00
81Denton
3a0c5e75b3 Adds a new job: the Paramedic (#48236)
* Adds a new job: EMT

* adds code

* either adds or removes code, hard to tell at this point

* Never not on it, leanin' so hard you're ashamed
You can't dismiss this sick transmission, huffs your brain
Exhale your will and forget I ever knew you
Fuck do you do?
Fuck a man with hips for hulu
Rack a snitch, chalk and cue you
Corner pocket consume you
Too many hoes in my
Too many hoes in my motherfuckin' meal
Asking if I know how a motherfucker feels
How a motherfucker feels

* 300 hours in MS Paint

* map editing is almost as pleasant as CBT

* remove crepe

* indentation

* map merge

* crew pinpointer, EVA access

* sick sprites by twaticus

* Replaces pen acid bottle with calomel

* Moves crew monitor/pinpointer to premium

* Triple six, five, forked tongue
Subatomic penetration rapid fire through your skull
How I shot it on one taking it back to the days of trying to lose control
Swerving in a blaze of fire, raging through my bones
Oh shit I'm feeling it Takyon
Hell yeah, fuck yeah, I feel like killing it Takyon
Alright that's tight, what its like to experience Takyon
Out of the blue, in through the back
Door coming through like fuck what was that
Man I don't know, but it made me feel so heated
How we creep without showing you jack
Shit from below, give a shit if you know
'cause even if you did, you'd keep coming back
Back for more, need it man you're addicted to the heat
We make beats catch
Beat it til it bleeds to death, each track
Like EPMD snappin' necks as we tap energy
From everything on and off the map
Oh shit I'm feeling it Takyon
Hell yeah, fuck yeah I feel like killing it Takyon
Alright that's tight what its like to experience Takyon
Takyon, shot down your throat like a keg of beer
Choke on the smoke we in and exhale 'til the whole chamber is clear
Haters act so fucking weird
Try to stain this atmosphere
But they can't 'cause its way too sheer
How to make a hater disappear
Take shit where it ain't never been
Fuck what you thought could not comprehend
This shit if I fisted your brain with it
10-9-8-7-triple 6-5-forked tongue
Criminal level crunk lightning storm
Get out the way or get up torn
Ain't a picture big enough to fit
What we dig up from the core
Of all that they forgot ever was
Militant march of this war
Takyon taking them down
All we see is blood
Takyon turning them out
How to trick out and freak that buzz
Oh shit I'm feeling it Takyon
Hell yeah, fuck yeah I feel like killing it Takyon
Alright that's tight what its like to experience Takyon
Lunar eclipse forcing you to trip
Off the moonlit fire we spray
Cryonic haunted bullets hollow tipped with toxic waste
So here's the deal, if you don't feel ill
Don't want it nowhere near my zone
That shit is dead, can't nobody get
With that shit gets dial toned
Takyon bitch slappin pussy clots and clones
Takyon settin' off uni bombs inside your dome
Oh shit I'm feeling it Takyon
Hell yeah, fuck yeah I feel like killing it Takyon
Alright that's tight what its like to experience Takyon

* YUH

* Updates sprites

* changes job order, uncomments plasmeme clothes

* Updates outfits

* last commit I swear

* bottle descriptions

* Renames EMT to paramedic

* Renames existing EMT clothes to paramedic as well

* Add missing job icons for Paramedic (#9)

SecHUD icon
ID card icon

* Improves descriptions

* Reverts vending balance change, replaces random spaces with tabs

* Resolves map conflicts

* Update strings/ion_laws.json

Co-Authored-By: BadSS13Player <58376109+BadSS13Player@users.noreply.github.com>

* Adds missing pda_slot to the paramedic outfit

* roller bed starting equipment

* Fixes map conflict

Co-authored-by: JJRcop <jrubcop@gmail.com>
Co-authored-by: BadSS13Player <58376109+BadSS13Player@users.noreply.github.com>
2019-12-27 10:29:12 -05:00
BadSS13Player
184d055cca Creation of AIs and silicon law changes are now reported in deadchat (#48216)
About The Pull Request

This PR adds deadchat notifications for law changes of AIs and unsynced borgs (listing the full new lawset), uses of AI/Cyborg Upload and the creation of new AIs.
Why It's Good For The Game

The AI is one of the most important players in the round, so it only makes sense that players watching in deadchat are kept up to date on its laws, especially hidden laws since they are never stated.
Changelog

cl
add: Silicon law changes are now reported in deadchat.
add: The creation of new AIs is now reported in deadchat.
/cl
2019-12-27 08:26:55 +13:00
81Denton
da72150faa Christmas trees can no longer be cut down (#48371)
It's a seasonal event and I don't see any value in having christmas 
trees cut down within a few seconds. They can still be destroyed if 
someone puts in enough effort, it'll just take a while due to the 150 
base integrity.
2019-12-24 11:30:21 -08:00
skoglol
dce99ad333 Logs logging 2019-12-23 05:12:48 +01:00
AnturK
c06a1324b3 Another bunch of runtime fixes. (#48315)
* Pipe init runtime

* Modular computer explosion runtime.

* Waterbottle thrown by explosion runtime.

* Spark runtime. Should systems continue after deletion ?

* restore ghost appearance runtime

* parallax update timer runtime.

* borg unbuckling runtime

* surgery cancel runtime. FALSE is not a null.

* relic self deletion runtime.

* dog collar runtime

* Another part of that buckled_mobs robot runtime.

* Let's go over all of these

* free ()

Co-Authored-By: MrPerson <spamtaffic@gmail.com>

Co-authored-by: MrPerson <spamtaffic@gmail.com>
2019-12-21 18:28:19 +01:00
Ty-the-Smonk
5f9ebbe223 no more " " wizard for you (#48308) 2019-12-20 19:43:04 +01:00
skoglol
4a487ca803 Refactors language holder (#48106)
* Language holder refactor

* Ironed out bugs, testing

* adds sourced language, blocking list. more useful helpers.

* Replaced old usage

* Adresses requests

* Autodoc attempt #1

* Fixed monkeyize (again)

* Travis happy

* Language menu updated

* Final pass
2019-12-18 22:22:12 +01:00
AnturK
54f32f26ad Fixes few minor runtimes. (#48234)
* Fixes emagging stuff without user

* Fixes missing initalizes

* Fixes deconstructing for materials

* Fixes tracker bullets runtime.
2019-12-14 14:15:15 -05:00
Ryll Ryll
beff318999 Adds a bunch of new achievements (#48094)
About The Pull Request

Now that achievements are open for adding again, adds 7 new misc achievements-

    Disk, Please!: As a nuclear operative, hold up the captain with a loaded rocket launcher. The captain must be conscious for it to count!
    My Watchlist Status is Not Important: Get reported to security and medical staff by displaying antisocial tendencies in a video game.
    I Was a Teenage Anarchist: Get killed by a vending machine falling on you.
    Mister Sandman: Kill someone by botching surgery while they're asleep
    A Bowl-d New World: Die to a toilet
    How Do I Switch Hands???: Hit yourself idiot
    One Lean, Mean, Cleaning Machine: Gaze upon a fully promoted cleanbot

Why It's Good For The Game

Adds more fun things to do for the gamer cred that aren't just killing things on lavaland
Changelog

cl Ryll/Shaps
add: A bunch of new achievements have been added! To name a few, there are achievements for holding up the captain with a rocket launcher as a nuclear operative, dying to inanimate objects, dying in a toilet, and getting watchlisted! Go do some dumb stuff!
/cl
2019-12-11 14:36:31 +13:00
Rob Bailey
a90a158f4d Replaces some dumb usage of switch with simpler statements (#48138) 2019-12-07 11:38:17 -05:00
ShizCalev
8efa6479ce Adds cell deletion handling for stunbatons (#48108) 2019-12-06 12:20:24 +01:00
carlarctg
fd0cfe9389 The Defib Nerf (Defibs are no longer a 10 second paralyze) (#47675)
* hardstuns? nostuns*

* WELCOME TO THE HAPPY HOTEL

* YOU'RE GOING TO LOVE IT HERE

* whoops i accidentally a status effect and a new item

* skog alert

* Update code/game/objects/items/defib.dm

Co-Authored-By: skoglol <33292112+kriskog@users.noreply.github.com>

* Update code/game/objects/items/defib.dm

Co-Authored-By: skoglol <33292112+kriskog@users.noreply.github.com>
2019-11-29 14:31:54 +01:00
AnturK
a31c460dc0 Moves achievements from Hub to DB. (#47617)
Drops byond hub support and adds score and top 50 browsers.

Requires DB changes and manual creation of migration script if we want to keep old achievements so no random merges please.
2019-11-26 20:35:28 +13:00
py01
f910ebad5d removes unused carboard box code (#47967) 2019-11-25 20:28:22 +00:00
Pacmandevil
c7ddbb24e9 Generic Map Popups + spy glasses (#46891)
* Map initial

* removes abstract

ok

* cleanup+Ninja fixes

* Update map_popups.dm

Fixes some runtimes.

* Update map_popups.dm

* coded cringe

gonna lose

* WIP

Adds spyglasses, fixes a pretty major bug.

* more bugfixes

* more bugfixes

* fixes the lighting issue.

* fixes tracking/reorganizes it

just need to do the polishing now. I'll do it when I wake up.

* fixes and shit

should be good to go now. didn't impliment the cloning, mostly because I'd feel it'd be kinda OP.

* feedback for dummies

Fuck the entire "For Dummies" series of books seriously the way that dumb fucker on the cover looks pisses me off it's like his eyes are some shitty anime girl but without any of the ass or thighs present on normal anime girls, literally all the minuses without a smidgen of a plus god FUCK I hate him.  He knows it too, the smug bastard is smiling. "tee hee" he thinks, point up at some text we OBVIOUSLY can't see without noticing his smug ass mentioning it. "What a dumbass, can't even see the text" well guess what, idiot. I CAN see it, and I hate you all the more for it.

* ‼️

* background

remember when this was just to get a hacktoberfest tshirt lmao
2019-11-25 17:30:34 +00:00
Rob Bailey
a6c28db6a7 Some small random tgui-next uis (#47712)
* dna vault

* engraved messages

* holodeck

* fix

* remove unusued imports

* spawners menu

* small tweak

* </b>

* rebuild
2019-11-21 04:22:54 +00:00
Emmett Gaines
5481515dff Removes the non bitflag slot defines (#47742)
Removes the non bitflag slot defines
2019-11-17 17:52:11 -08:00
py01
3d6a229d2f chef cqc table slam fix (#47718)
chef cqc table slam fix
2019-11-13 16:40:36 -08:00
spookydonut
dd6fa5eded More spawn/sleep removals (#47634)
* remove more spawns

* more

* more

* varsets

* oops

* unfuck this
2019-11-13 03:07:59 -08:00
Tad Hardesty
406cf1cd4b Mark airtight plastic flaps plural (#47687) 2019-11-11 11:52:15 -05:00
AnturK
c20b4d5ab2 Replaces lentext with length (#47585) 2019-11-07 11:42:33 -05:00
Ghom
f325b3e5a0 Fixing "walking down stairs shows falling message" (#47588)
* I'm too tired to even PR it atm.

* Update code/game/turfs/turf.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* Update code/game/turfs/turf.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* Update code/game/turfs/turf.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* atom signal, not movable.
2019-11-07 11:26:43 -05:00
Rob Bailey
13abb720b5 GPS, suit storage, and tank dispenser tgui-next (#47480)
* gps, suit storage, tank dispenser tgui-next

gps work

Final gps

suit storage + tank dispenser

* Improve GPS with direction arrows

- Added some collection manipulation functions
- Table is 100% wide by default

* Clamp GPS window height to safe range

* Calculate distance using vector maths on client side

* Remove logging

* More robust keying for GPS signal rows

- Protects from sorting glitches

* rebuild

* rebuild
2019-11-06 19:28:35 +01:00
spookydonut
2591ce17a6 Travis EOF newline detection v3 (#47539)
* scream

* aaa

* aaa

* new one
2019-11-04 19:16:50 -08:00
skoglol
43a41e35a7 Janitors start with holosigns again (#47513)
* Janitor start with holosign instead of barrier, barrier now only blocks carbons.

* And unconscious for the other ones too
2019-11-03 01:42:17 -08:00
81Denton
ab695c72a9 Fixes open space turf layering (#47501)
* Fixes open space turf layering

* typo
2019-11-03 01:53:39 -07:00
Firecage
e4330b63bb Fixes the issue of not being able to wash objects in sinks. (#47506) 2019-11-03 01:52:59 -07:00
ArcaneMusic
6e238392bf Adds several different uses for plastics (Cups, Utensils, Folding Chairs, Station Signs) (#47486)
* Initial PR, Cups, Utensils, Signs, Chairs

* Endline fixes for travis, adds plastic utensils to the initial node

* Makes bar invisible, addtimer added, fixes potential dmi/dm conflict

* Fixes Merge conflict take 2

* Wraps the chair snapping proc in invoke_async

* Cleans up Async Call a smidge
2019-11-02 20:30:35 +01:00
MrPerson
a0753d6ca3 Improved material colos
Gave better color matrices to some materials. Simplified some of the existing matrices down. Gave uranium a standard color since it didn't need a matrix. Made bananium obnoxiously bright. Made gold slightly less bright. Made diamonds somewhat brighter. Made glass actually look like glass, it was almost grey before wtf.
Improved some of the greyscaled sprites used by materials, many of them were too dark and/or straight reused from other things. Some of them weren't even grey come on guys.

I'll add some pics later.
2019-10-30 23:37:31 -05:00
kingofkosmos
8768b6b3b5 Removes unused & undefined spans (#47436)
* Removes all instances of 'caution', 'error' and 'notify'.

* Removes span classes which were either not used at all or were used very infrequently.
2019-10-30 02:00:11 -07:00
ArcaneMusic
f796acbaf8 Adds a new Lavaland Ruin, the Elephant Graveyard (#47325)
* Initial Commit, Features the Map, Map specific files, changes to a metric ton of icons, etc.

* Fixes merge conflict, actually adds the map

* Spelling is hard Part 1

* Alright, steps are bad. Got it.

* Clean slate, please pretend to compile

* dme issue

* Fixes it for lavaland elites PR

* Removes the last dirty step_x, removes duplicate file, makes treavor happy

* Fixes some newline issues.

* Fixes some types, spawns skeletons in select graves since mob_spawns kept shoving them outside.

* Makes bone statues and shovel actually craftable, cleans up some comments.

* Properly defines muddy paper, updates map, fixes a few more typos.

* Prevents some future turf atmos issues, finally touched up the two skull sprites.

* Refactors strong mineral drops, cleans up some duplicate code, prevents washing hands with OIL

* I swear officer, i'm a native english speaker, fixes remains dropping correctly, un-nests my Ifs further.

* Oil well now covers target in oil when interacting with it.

* Refactors sink deconstruction a bit, oil wells can't be constructed with a wrench.

* Cleans up some atmos, and adds a return

* Adds subtype of remains for use in graves, move their spawn to src, not loc

* Moves around remains spawn, gets rid of untouched var
2019-10-26 21:41:43 +02:00
Qustinnus
8a01398814 Adds achievement datums (#47058)
* First step

* achievements part 1

* epic

* done

* epic

* removes test datums

* adds minecraft achievement

* asss

* ass 2

* ass

* fix

* UPGRADE

* back-end partially

* back-end

* woops

* epic

* linted

* Achievements (#19)

* initialize SSachievements lists

* achievement ui actually tries to load

* witty commit description

* menu

* done

* done

* jesus christ

* ok linter

* Update code/datums/achievements/_achievement_data.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>

* Update _achievement_data.dm

* Update misc_achievements.dm

* Update achievements.dm

* Update

* And a space, goddamit!

* Rebuild tgui

* woops

* bruh moemnet

* ok conflicts

* finally
2019-10-26 05:57:42 -07:00
Arkatos1
5b2e71cff6 Toilet fixes (#47349)
* Monkey cube toiler fix

* Fingerprints
2019-10-26 00:41:58 -07:00
Kaffe-work
bb85177eed Locker bloat removal (#47252)
* Removes garbage from CE locker

* removes bloat from Cap/hos/hop lockers

* removes bloat from RD locker

* re-adds Advanced extinguisher

removed by mistake, mixed it up with the compact one you can have in your belt

* removes some more stuff from CMO

* gloves+oxygen removal
2019-10-26 00:31:14 -07:00
defiantGrace
21ccda7002 Makes toilets and sinks constructable (#47320)
* Makes toilets and sinks constructable

* Update code/game/objects/structures/watercloset.dm

Co-Authored-By: Emmett Gaines <ninjanomnom@gmail.com>
2019-10-25 16:33:08 -07:00
81Denton
6b1161ecd9 Cleans up revive related procs (#47025)
* Cleans up revive related procs

* h

* fuck

* Fixes proc arguments

* Further fixes

* Unfucks line endings
2019-10-22 15:16:13 -07:00
genessee596
9cb5db5ba3 Removes all budget cards except for cargo card, gives cargo small steady income -- [ACTUALLY WORKS THIS TIME] (#47256)
Exact same as my earlier PR, but it actually works - [https://github.com//pull/47212]
Changelog

cl
del: Removed all departmental budget cards except for cargo card
tweak: Cargo now gets 500 credits per paycheck
balance: Cargo can't amass infinite money from other departments
/cl
2019-10-23 09:13:06 +13:00
carlarctg
6a65a85fe0 Reflector Trenchcoat replaces armory reflective vest (#47116)
* reflector vested

* denton REE

* Update hats.dmi

* a

* hmjhjmhfmjhmgfmjgm
2019-10-22 04:35:14 -07:00
skoglol
938e66f62c Adds sorting to most input() lists (#47117)
* Adds sorting to most input() lists.

* Sorted some global lists, added more input sorting

* Should now use correct sort everywhere.

* compiles

* Last fixes.
2019-10-22 04:28:42 -07:00
81Denton
f5bd6a381d Merge pull request #47052 from kingofkosmos/misc_span_fixes1
Misc span fixes
2019-10-20 18:46:54 +02:00
ArcaneMusic
e8160371a7 Adds the Cleric's Den ruin, and Datum Maces. (#46915)
* REWROTE EVERYTHING

* And these too

* Mapmerger as usual

* Qust changed some datum mat stuff, fixed

* Updated the rune sprite to be in-line with blood cult style runes.

* Uses a less degenerate sprite for the rune
2019-10-20 00:24:58 -04:00
spookydonut
4e8ff18b07 Fix Travis grep script to use PCRE to actually match things (#47065)
Several of the greps were missing the `-P` switch which caused them to 
fail to match things. The EOL grep also wasn't working right so I 
replaced it with the one I added to TGMC.
2019-10-19 10:21:05 -07:00
Fikou
d61384ce84 adds bronze windows and airlocks (#46921)
* bronze windows

* awoo

* badoom

* bronze airlock

* awoo

* nice

* oof
2019-10-18 20:11:27 -04:00
81Denton
6e4996e6e3 Merge pull request #47157 from Time-Green/plunger-masks
Adds plunger unicorns
2019-10-19 01:24:02 +02:00
Emmett Gaines
8982f509b5 Refactors screen object update_icon to call parent (#47094)
* Refactors screen object update_icon to call parent

And makes update_icon an /atom proc

* Cleans up some missed null checks

The student teaches the master
2019-10-17 18:21:50 -07:00