Commit Graph

159 Commits

Author SHA1 Message Date
Ryll-Ryll
fce9aaae38 tip 2020-02-29 06:34:33 -05:00
pireamaineach
8c8afcaaa2 [READY] Plasmaman sprite changes. (#49406)
* Does the thing.

* whoops I fucked up some item_states

* when I said item_states I meant icon_states also I didn't properly fix it

* Update hats.dmi

* Makes the prisoner suit look more unique.

* "Forcing the Icon Bot to Do it's Job"

* Update mime.dm

* Adds a new plasmaman name!

* Update plasmaman.txt

* Update plasmaman.txt

* Did the thing.

* plasmagloves^tm

* arms

* Update packs.dm

* Trailing newline done
2020-02-25 15:51:01 +01:00
ShizCalev
4316f79d32 Fixes some inconsistencies with CentCom & Nanotrasen capitalization, and a couple typos (#49469)
typo fixes, inconsistencies with Nanotrasen capitalization, ect
2020-02-22 22:35:53 +13:00
EOBGames
297d7e7d9b TG's Got the Pop Factor: The Singing Update (#49063)
* Sing a lovely song

* minor changes, ~ to %, and removal of specific logging

* 512 support

don't trust byond

* oops
2020-01-31 20:10:55 +01:00
JJRcop
7ad527ff9a Move drunken scientist quotes to strings (#48953)
This moves the drunken scientist quotes into a strings file.

I used the pick_list_replacements proc even though there are no replacements, in case someone who edits the file wants to add some replacements.

I didn't take the opportunity to sneak in any lines, they are copied verbatim.
2020-01-24 17:32:39 +13:00
Fikou
bc0013b2e6 Change a botanist tip to be more helpful (#48867)
changes botany tip to mention how you can use radium or uranium if 
chemistry is a bitch or you didn't get a chem dispenser and need to 
mutate stuff
2020-01-19 12:11:44 -08:00
spessbandit
6b73074a44 Adds new valentine's text, plus valentine-themed arcade enemie… (#48561)
* spruces up valentines and arcade text

* more

* removes hornyposting

* this is what I was born to do

* motherfucker I forgot they removed sleepers

* technically I could add handling of articles/plurals but too fucking lazy
2020-01-12 19:34:55 -08:00
skoglol
8c4fda16e8 Updating Traumas to the Present Day (#48540)
* REVIRT COBY CHEM!!!!!!!!

* More stuff because funny
2020-01-04 21:03:27 +01:00
Rob Bailey
cbad6e4de5 Contractor Uplink tgui-next overhaul (#48453)
* tgui next contractor interface

work

cleanup

more work

getting close now

final

build

more stuff for wanted messages

rebuild

spelling

* fixes

* rebuild

* fix

* disable button when contract not active or extraction enroute, disable limited when depleted
2020-01-03 11:29:38 +01:00
EOBGames
f8cb3ac804 More stuff because funny 2020-01-02 17:57:06 +00:00
EOBGames
0b4f9c2a90 REVIRT COBY CHEM!!!!!!!! 2020-01-02 17:52:19 +00: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
skoglol
706f608429 Fixes codeword location picking (#48468) 2019-12-31 14:00:30 -05:00
81Denton
8a43df470e Adjusts redpill.json (#48443)
Minor tweak to redpill.json since most races have their own native language now
2019-12-30 14:38:42 -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
Paxilmaniac
1b0c4212a9 Monkey Energy Overdose (#48381)
About The Pull Request

Gives monkey energy an overdose that makes you spout random phrases that make you sound like a boomer.
Why It's Good For The Game

Makes it quite obvious when you have been chugging unhealthy amounts of monkey energy.
Changelog

cl
add: overdose effect to monkey energy
/cl
2019-12-27 10:35:40 +13:00
actioninja
ff444890a3 . 2019-11-26 04:31:35 -08:00
KomradeSpectre
9ff071af60 Clockcult Removal 2019 (#47057)
* Nanotrasen fires the Wave Motion Gun at the Clock Cult

* Fixes a random changelog appearing from the reebe void.

* Fixes a wrong type reference regarding the bronze sheets in the Lavaland Ruin for it.

* Fixes redundant cells after CC removal in ruin by populating them with varied ore chunks, or destruction clutter.

* why is it /obj/item/stack/sheet/metal but not /obj/item/stack/sheet/iron

* Fixes the lavaland ratvar ruin to have fluff variant structures of deleted shit it referenced instead what I thought was reasonable.
2019-10-15 10:13:41 +02:00
spessbandit
87e3687bf2 Adds custom arcade game text for Halloween and Christmas. (#46795)
* Adds special arcade enemies for Halloween and Christmas. Moves arcade stuff to json file in preparation to add more eventually.

* adds custom weaponry

* fixes bug
2019-10-07 12:17:11 -04:00
Fikou
ec620d1545 Renames some CentComm to CentCom (#46883)
not supposed to happen
2019-10-05 13:13:37 -07:00
wesoda25
7f2dd17798 Italian Mustache Text Change (#45903)
* :)

* bebe
2019-08-21 16:33:48 -04:00
bgobandit
82c6c5a46b refreshes cas (#45931) 2019-08-17 00:38:49 -07:00
Trilbyspaceclone
1d3351c389 Update clown.txt 2019-07-28 07:06:37 -04:00
Fikou
a3fa935472 Turn a Centcomm into CentCom (#44752) 2019-06-23 21:38:07 -07:00
Eaglendia
9b8404d489 Smoking is now rad. [Ready] (#44066)
* Automatic changelog generation for PR #44023 [ci skip]

* You can light a cigarette on the supermatter shard.

* Update tips.txt

* Update supermatter.dm

* Update supermatter.dm

* Clumsy condition

* Update supermatter.dm

Cleaning up that message

* Update supermatter.dm

removing big dummy proc calls
2019-06-01 23:54:45 +02:00
bgobandit
d0b10b50a5 Fixes Cards Against Spess and refreshes cards. (#44158)
* Fixes CAS and refreshes cards.

* fixes for loops, adds more cards

* fixes bug, adjusts prices
2019-05-28 01:55:40 -04:00
zxaber
3b4a56ddfd Add AI Camera Hotkey tip (#44062) 2019-05-22 15:17:13 -07:00
Coconutwarrior97
1ec24b49bc The future is now old man. (#43789) 2019-05-03 11:43:23 -04:00
Strommer Kilian
9529063aa3 New brain trauma: expressive aphasia (#43608)
* new mutation: simple speech

* finalize simple speech and fix word list apostrophes

* Is now a brain trauma instead

* fix merge conflict

* grammer fix

* cleanup cause I'm an idiot

* made the suffix list a bit easier to read

* fix traits.dm
2019-05-02 19:48:38 +12:00
ShizCalev
68f838f57b Merge pull request #43208 from plapatin/tips.txt
new tips, updated old tips
2019-03-21 23:53:20 -04:00
plapatin
1631906ad9 and another one 2019-03-21 10:20:07 -07:00
plapatin
a2102ff916 one more 2019-03-21 10:19:50 -07:00
plapatin
186d3e611a clearing up MORE tips 2019-03-21 10:18:52 -07:00
plapatin
6f4e758765 it does 2019-03-20 07:43:39 -07:00
plapatin
3f3ad36bd2 fixing all the reviews 2019-03-20 07:39:27 -07:00
MrDoomBringer
164dcf2a4d Update strings/tips.txt
Co-Authored-By: plapatin <43917079+plapatin@users.noreply.github.com>
2019-03-19 17:55:59 -07:00
plapatin
52b18d3487 new tips, updated old tips 2019-03-19 16:33:57 -07:00
Trilbyspaceclone
de9e157fd7 Sort clown names file alphabetically (#43131) 2019-03-16 19:07:17 -07:00
plapatin
dec7b2f5a5 Adds a bunch of new clown names to the .txt (#43113)
* updates clown.txt

* immediately after creating the pr i noticed a duplicate name

* and another one

* Update strings/names/clown.txt

Co-Authored-By: plapatin <43917079+plapatin@users.noreply.github.com>

* alright alright scootaloo is coming back
2019-03-14 11:32:14 -04:00
Vile Beggar
313db3ad8b Tweaks the drill hat to be a bit less annoying (#42655)
* does the tweaking

* indent fix

* adds more canadian variety

* no longer mr politeman

* adds cobby's review suggestion

* gets rid of mutation defines

* makes it use speechmod

* removes accidental letters

* gets rid of unneeded comma in .json

* changes magic number into defines

i hope it's supposed to be like this

* compile fix

* gets rid of yelling define in dna.dm

* removes unneeded line in .json
2019-02-09 22:26:49 +11:00
Jordan Brown
01b5b4f289 Merge pull request #42488 from tgstation/revolutionary-gamemode-removal
Removes revolutions
2019-01-24 09:23:52 -05:00
nervere
91dd51f197 New brain damage line: the scrungulartiy (#42486)
* scrungularity brain damage line

big scrungus

* forgot a comma lol

* critical spelling error

* spaces not tabs

Co-Authored-By: nervere <26285377+nervere@users.noreply.github.com>
2019-01-23 21:27:45 -05:00
oranges
2cb1296d59 Removes revolutions
tip that wasn't accurate.

Revolutionary is more about who you convert (both in a meta sense of robust people) and their job accesses.
2019-01-23 19:06:41 +13:00
bgobandit
ed3f3af978 Moves valentines/candyheart messages to json; adds new text (#42358)
* Moves valentines/candyheart messages to json; adds new text

* commas are my passion i love commas more than anything in the world give my valentine to commas and then FUCKING KILL COMMAS HOLY FUCK GOD

* commas.

* EVEN MORE VALENTINES

* I can't stop
2019-01-16 14:56:03 +13:00
coiax
7528a529ab Added Curse of Madness to Summon Event pool (#42100)
* Added Curse of Madness to Summon Event pool

🆑 coiax
add: Curse of Madness can now be triggered by a wizard's Summon Events,
at the same chance as Summon Guns or Summon Magic.
admin: When an admin triggers Curse of Madness manually, they can
specify their own dark truth to horrify the station with.
/🆑

Random Curse of Madness events pick a line from the redpill.json file,
which I've added some more entries to.

* REDPILL_FILE
2019-01-07 19:19:12 +13:00
81Denton
fdd2a1d8e9 Red pills sometimes make people think (#41883)
Remember that scene from The Matrix? This PR adds a 5% chance that swallowing red pills makes you think about stuff the average Nanotrasen employee isn't supposed to pay attention to.
2018-12-11 10:43:40 +13:00
Jack Edge
bcecb676a5 Compilation 2018-12-03 23:46:28 +00:00
Qustinnus
b9f5dbac6b Adds a new race: Ethereal (also adds wrappers for nutrition adjustment) (#40995)
cl Qustinnus / Floyd / Ethereal sprites by Space, is that it? / Alerts and food sprites by MrDroppodBringer
add: Adds Ethereal; a race which lives off of electricity and shines bright. If they are healthy they shine a bright green light, and the more damaged they are, the less they shine and the greyer they become. Their punches do burn damage and they are weak to blunt attacks!
They dont need to eat normal food and dont have nutrition, Instead they gain charge by going into borg rechargers, eating ethereal food or doign specific interactions.
refactor: all nutrition changes now go through a proc so we can override behavior
/cl

Adds Ethereal. A race which is essentialy inspired by Zoltan but then with different mechanics to make it fit with SS13 more. I'm trying to stay away from making them actually provide power but the change from nutrition to electricity seemed kind of fun.

They have the following specifications:

    They are walking lights; and shine bright and green if healthy, and get greyer and darker the more damaged they are. When dead they are just a grey unlit corpse.
    They do burn punch damage instead of blunt.
    They are weaker to blunt; especially when low on charge
    They have charge instead of nutrition. Charge is gained by some interactions or by going into a borg charger. or eating new ethereal food.
    They are slightly stronger to shock damage, and gain charge from it a bit; however, it is still deadly to them and thus they aren't free insulated gloves.
2018-11-29 10:09:56 +13:00
ShizCalev
214eae8d82 Fixes a bunch of missing symbols 2018-11-12 19:05:02 -05:00
81Denton
425201fbe1 Adds more death commando names (#40972) 2018-10-18 19:26:02 -04:00