Commit Graph

19607 Commits

Author SHA1 Message Date
KorPhaeron 96d24a8133 Buffs catgirls 2017-03-01 15:58:48 -06:00
Jordie 72a93bae7d Continues to add default sql indexes and table optimisations (#24456)
* adds default sql indexes and table optimisations

* fixes warnings

* edits to text and better update queries

* wrong table

* superior copypaste skills

* who has

* names

* that long

* add inet

* fix for badmins giving 2 billion brainloss

* fixes rank name and adds sanitizing
2017-02-27 22:44:26 +11:00
oranges 1ca72e1c71 Merge pull request #24463 from Tofa01/aiferry_master
Stops AI And Borgs From Interfacing With Ferry Console
2017-02-27 12:41:07 +13:00
coiax 3dee7c96b6 Drone shell changes (#24379)
* Drone shell changes

Fixes #24376.

- Drone shells are now points of interest.
- Derelict drone shells are now just dusty drone shells.

* For GUN_HOG

* Adds ushanka to derelict drones

* Less compiling errors
2017-02-27 12:28:31 +13:00
Tofa01 ecbd387bd7 Fixes a grammar issue (#24436) 2017-02-26 15:34:17 -06:00
Tofa01 1c4e0f832a Fixes ID Access For Player Sleepers & Fixes Space Bar Access To Kitchen Freezer (#24430)
* Fixes space bartender not able to access kitchen freezer

* Fixes id_access on awaymission sleepers
2017-02-26 15:31:55 -06:00
Tokiko1 069443c193 Removes roundstart singularity, adds roundstart supermatter, supermatter now collapes into singularity (#24447)
* Adds supermatter to box.
Adds orange pipes.
Makes the supermatter spawn a singulo.

* Added orange pipe manifolds.
Added a supermatter crystal and replaced the varedited shards on box and meta.
Added supermatter engine to metastation.

* Removed singulo from Deltastation.
Gave engineers access to some Deltastation atmos areas, including the engine.
Fixed some access bugs.

* Misc fixes.

* Fixed the roundstart reflectors being impossible to deconstruct.
Bunch chamber tweaks on meta.

* Poly now squawks about the supermatter engine instead of the singulo.
Radiation collectors are now half as efficient.
2017-02-26 15:20:27 -06:00
Tofa01 cf5ca0b79a Stops AI and borgs from interfacing with ferry console 2017-02-27 01:19:15 +11:00
AnturK 2f21bc58e9 Fixes lobby sound runtimes (#24351)
* Fixes lobby sound

* Duh

* Good suggestion
2017-02-27 00:39:49 +13:00
Joan Lung d5df752c0e Faction fixes (#24396)
* Faction fixes

* heh

* hup!

* i'm smart
2017-02-27 00:39:01 +13:00
coiax af5fc7edfb Removes a rogue space from the slap message (#24427) 2017-02-25 17:48:25 -06:00
anconfuzedrock f8a311b51b Adds glorf jumpsuits as an assistant exclusive 20tc traitor item (#24285)
* adds glorf jumpsuits as 20tc assistant exclusive

* alright this time not on my master

* this time it exists and its not on my master

* fixes capitilization in the fucking word "Yeah"

* I liked the uh but it was kinda weird in that sentence I guess

* Is this better

* I didn't know I had to specifically put surplus = 0 my bad

* glorf
2017-02-25 12:51:29 -06:00
coiax 82e123a227 Adds plastic, makes plastic flaps constructable and deconstructable (#24257)
* Adds plastic, makes platic flaps constructable

🆑 coiax
add: Cargo can now order plastic sheets to make plastic flaps. No doubt
other uses for plastic will be discovered in the future.
/🆑

Later maybe we can make cable coils use plastic and metal, rather than
metal and glass. And make plastic tables. And make foam darts use
plastic rather than metal. And make spray bottles out of plastic. And
cheap plastic tables. And cheap plastic chairs.

Why? Because plastic makes sense as a material that you can make stuff
out of, and those DAMNED PLASTIC FLAPS AREN'T CONSTRUCTABLE.

* New plastic sheets sprite (STOLEN FROM BAY)

* Making plastic flaps takes time

* Constructable flaps

* Deconstruction time like walls
2017-02-25 15:54:09 +13:00
AnonymousNow db7a8e3510 Adds Jamjar Glasses (#24373)
Now's PR experiments #3: Adding an item to a vending machine. Part of a series of tests for me to figure out how the code works a little better.

These are Jamjar Glasses, so called because they're as big and thick as the bottom of jam jars. They're a comical "fashion" item alternative to regular prescription glasses, with all the same functionality. They appear in the Clothesmate vending machine, where they replace one of two existing pairs of prescription glasses.
glasses

🆑
add: Nerd Co. has sent pairs of thicker prescription glasses out to Nanotrasen stations, for your local geek to wear.
/🆑
2017-02-25 15:53:47 +13:00
KorPhaeron e01866219e Fixes mutant eyes (#24338)
* Eyeballs for mutants

* Removes redundant lines
2017-02-24 19:17:38 +01:00
uraniummeltdown bf0f599a05 add science crates from /vg/ (#24349) 2017-02-24 12:08:36 -06:00
militaires ac701e9299 Merge branch 'master' of https://github.com/tgstation/-tg-station into more_3/4
# Conflicts:
#	code/game/machinery/cloning.dm
2017-02-24 11:54:55 +03:00
Dannno 88d417bcb6 add flavor fix poster 2017-02-23 17:32:14 -05:00
vcordie 6da76d83fd Adds the mech tesla cannon (#24252)
* Adds the mech tesla cannon

* makes it not stun

* fixes a dumb

* fixes another dumb

* makes it not blow fucking doors up instantly

* corrects an oversight

* Revert "corrects an oversight"

This reverts commit 73c713a3649deee6945f005f3c14ec926c9559f2.
2017-02-24 09:53:35 +13:00
Joan Lung d9149849b0 Clockcult fixes (#24313)
* Clockcult fixes

* Silicons had identical stun procs for some reason

* oh.

* proper!
2017-02-24 09:46:35 +13:00
Cyberboss 3424e7c5e0 Asay and dsay radio keys (#24341)
🆑 Cyberboss
add: Admins can now asay with ":p" and dsay with ":d"
/🆑
2017-02-24 09:44:14 +13:00
oranges 9dd7cfb2b1 Merge pull request #24329 from Tofa01/cryosound-master
Disables Sound Variance On Cryo Tube Alert Sound
2017-02-24 09:42:45 +13:00
AnturK aa36ffe84f Merge pull request #24368 from Cyberboss/LiterallyOnFire
Until I figure out why random keys aren't being transferred
2017-02-23 20:21:32 +01:00
XDTM 34aafab401 Fixes Voice of God (#24328) 2017-02-23 20:20:25 +01:00
WJohn a13a52a98f Merge pull request #24348 from dannno/vendy
Sodie pops
2017-02-23 07:55:34 -05:00
Kyle Spier-Swenson 8d42592399 Parallax defaults to disabled on 510 clients. (#24347)
* Update preferences.dm

* Update preferences_savefile.dm

* Update parallax.dm

* Update parallax.dm

client -> C
2017-02-23 01:20:54 -06:00
coiax 05026eee88 Taste (#24323)
* Adding taste to reagents

* Toxins mostly taste bitter.

* The taste of medicine is mostly bitterness

* Drugs taste bitter too

* It turns out pyrotechnics mostly taste like burning

* Alcohol and blob tastes

* Drinks taste mostly of drinks

* And the food reagents are the last, but not least

* Actual taste code

* You can now taste freshly spawned carrot cake

* Bread, burgers

* Debugging tasting

* Always add the reagents properly, I guess

* Finally got nutriment scaling working

* Finally got all the stuff working and mixing

* PEOPLE CAN NOW TASTE THINGS

* Mouthful only has one L

* Meat n dough

* Eggs and cakes

* Meat dishes taste of meat

* Others...

* Pastry... there is no end to the food

* PIE AND PIZZA

* SANWHICHES, SALAD, SOUP

* THE LAST OF THE FOODS ARE COMPLETE

* Weird indentation issues fixed

* Remove dat debug code

* Hydroponics and sugar is less strong

* Replaces carrot cake reagents

* Code review

* Fixes bad flavours
2017-02-23 00:59:34 -06:00
Cheridan 1d239f9ed3 Merge pull request #24369 from KorPhaeron/arms2
[s]Fixes augments being invisible
2017-02-22 22:52:17 -06:00
KorPhaeron b789f8503f Fixes invisible augmetic limbs 2017-02-22 19:55:31 -06:00
Cyberboss 16c4656eb3 Revert "Makes game start smoother (#23552)"
This reverts commit 3ab308aa0f.
2017-02-22 20:43:17 -05:00
kevinz000 5e93717158 The floor really can't seem to mount the NekoOS... (#24315)
* Update robot.dm

* Update human.dm
2017-02-22 20:34:53 +01:00
TalkingCactus 823efdbdcc fixes backpacks being = 1 in character creation (#24314) 2017-02-22 20:32:04 +01:00
Cyberboss 3ab308aa0f Makes game start smoother (#23552)
* Makes game start smoother

* Hide the sausage making

* Fix the shit

* Fixes AI's losing their name prefs
2017-02-22 15:55:50 +01:00
Cyberboss ccf3e74074 Cleans up new lobby timing (#24250)
* Cleans up new lobby timing

* Changes
2017-02-22 14:41:12 +01:00
AnonymousNow ab9724f1e0 Adds Medical HUDGlasses (#24096)
* Adds Medical HUDGlasses

Adds sunglasses with a built-in medical HUD. Functions as you would expect them to, tested locally with no issues, comes in a stylish blue.

I've wanted these for literally years, but I've only sat down and worked out vaguely how items and PRs work this week, so here they are. They haven't been added to any map yet - that's a debate itself - but I'm hoping to find an opportunity to test them, perhaps being ERT Medical Officer standard equipment before a single pair is put in medbay to fight over.

Lemme know what you think.

* Hopefully moves hud.dm to its intended place.

Root folder indeed. WTH, Git?

* Glasses.dmi in the wrong place

Yep.

* eyes.dmi in the wrong place

Alright.

* Re-adds eyes.dmi in the right place

Well, guess Git's not as smart as I hoped.

* Re-adds glasses.dmi in the right place

LET US NEVER SPEAK OF THIS AGAIN.

* Deletes the old hud.dm to take place for the new

This'll all be cleaner next time.

* Moves hud.dm to where it should have been in the first place

Second PR ever, everybody!

* Adds Inhands for sunhudmed and sunhudsec

Oops. Forgot the inhand sprites. While I'm here, let's give security HUDshades their own inhands - they use the generic shade inhands otherwise, it seems.

* Tweaks shading on sunhudmed

Makes it like my original concept image which I just found again (over four years old!); now it makes a little more sense and looks better.

* Tweaks colour on sunhudmed to be a little more distinct
2017-02-22 13:34:49 +01:00
MrPerson f4e768c895 Ion storm improvements (#24223)
* Ion storm improvements

Ion storms have several new additions:
25% chance to flatly replace the AI's core lawset with something random in the config. Suddenly the AI is Corporate, deal w/ it.
10% chance to delete one of the AI's core or supplied laws. Hope you treated the AI well without its precious law 1 to protect your sorry ass.
10% chance that, instead of adding a random law, it will instead replace one of the AI's existing core or supplied laws with the ion law. Otherwise, it adds the generated law as normal. There's still a 100% chance of getting a generated ion law.

All of these stack so you could wind up going from Asimov to Paladin w/o the first law and w/ the last law replaced with THE SHUTTLE CANNOT BE CALLED DUE TO FIVE NINJAS. All the values are easy to tweak if you guys want them higher or lower or whatever.

Custom admin-sent and other fake ion storms (devils) will just add the law and have no chance of doing any of the bonus stuff.

Removed the admin verb to send an ion storm since you can just use the events panel.

Cleaned up some of the law-adding backend. Hopefully there's no double showing of the AI's laws after a lawchange as a result of this.

* Everyday I'm shufflin'
2017-02-22 13:31:04 +01:00
Cyberboss 56a6eaa8e6 Overlay queuing (#23922)
* Overlay queuing

* Fix SS flags

* Don't copy on assignment

* Flags processing

* Fix icon_smoothing

* MSO's helper proc

* Legacy detection

* Make it work

* Fixes shitcode

* Fix the flag

* |= -> +=

* OK, how did I fuck that up?

* shitcode

* Conditional assoc queue while initializing

* Cleanup everything

* Orange meme

* This isn't perfect, but its the best byond will give us.

* forgot about dir

* oh ya

* This was litterally the last thing i did last night before heading to bed

You can tell can't you?

* Fixes various shit

* Let's not ever pause

* Fix the flag

* Cleaned up some missing shit. Added image dummys

* Remove the one usage of FPRINT

* Jesus get rid of this
2017-02-22 21:44:55 +13:00
Dannno b3463d20ce weeeeooooweeoowowowowow i deed it yah wah one up!!! 2017-02-21 20:59:29 -05:00
Xhuis dd9ef0dd0f Small Highlander patch (#24175)
* Enforces honorable combat

* Now with compiling!

* someBODY once told me the WORLD is gonna roll me

* DOES THE NEEDFUL
2017-02-22 12:00:06 +13:00
Tofa01 f33256a56f Disables sound variance on cryo tube alert sound 2017-02-21 23:15:13 +11:00
oranges cd1e9ea6c8 Easier stripping of admin private information from public logs (#24222)
A new admin log proc, admin_log_private that appends a different prefix,
to make it easy to filter the logs that are shown publically
2017-02-21 10:56:25 +01:00
Cyberboss 5b14349ec3 Fixes null.handle_fall()... again... (#24303) 2017-02-21 09:14:16 +01:00
Cyberboss e8b87c3c77 Fixes shunted AI's losing malf verbs (#24300) 2017-02-21 09:12:24 +01:00
kevinz000 8d20017fff Update mob.dm (#24297) 2017-02-21 09:09:29 +01:00
Cyberboss 71ac987a9d Fixes away missions not loading (#24296)
* Delete the old map_template.dm

* Fixes #24291
2017-02-21 09:07:50 +01:00
Quardbreak 83dbe874c5 Fixes touch hand qdel loop runtime (#24290)
* Fix touch hand loop runtime

* Fix #2
2017-02-21 09:05:48 +01:00
oranges 17a7c01e36 Revert "Adds default sql indexes and table optimisations" 2017-02-21 17:53:41 +13:00
Dannno 727cc8fea0 why god 2017-02-20 18:33:49 -05:00
Joan Lung 78d265e277 Merge pull request #24292 from KorPhaeron/pushing
Mobs pushing eachother wont change their direction
2017-02-20 17:46:32 -05:00
Cheridan f8206b2425 Merge pull request #24316 from kevinz000/patch-74
WOOPS I made grilleshocks cause explosions
2017-02-20 16:45:11 -06:00