Commit Graph
131 Commits
Author SHA1 Message Date
Anonymous b20984af89 B for Bad Grammar 2018-03-13 15:38:33 +03:00
Anonymous f3f0a06c57 Adds positive moods for headpatting, hugging box of hugs and playing with plush.
Also, you will now receive negative mood for butchering plush and trying to pet such plush.
2018-03-11 12:16:07 +03:00
deathride58andGitHub 45b473f14d Merge pull request #5843 from Poojawa/trek-outfits
Trek outfits
2018-03-09 18:46:11 +00:00
deathride58andGitHub 32812ce624 Merge pull request #5827 from NopeMcHaltman/goddamnit
Nymphotrait
2018-03-09 18:44:05 +00:00
deathride58andGitHub 5743ce2222 Merge pull request #5830 from Zna12/Biodegradable-Darts
Degradable Darts, Citadel Style
2018-03-09 18:43:35 +00:00
deathride58andGitHub 78db80026d Merge pull request #5840 from Poojawa/reverts-crybaby-inducer
Reverts crybaby inducer also does the sync things
2018-03-09 18:36:42 +00:00
Zna12andGitHub 0941433022 Merge branch 'master' into Filet-o-fish 2018-03-07 10:41:09 -06:00
NopeMcHaltmanandGitHub cdd9bd29d2 Merge branch 'master' into goddamnit 2018-03-07 16:20:17 +03:00
Anonymous b2a2165bfe Moves code into modular folder
Also fixes grammar. At least I hope.
2018-03-07 16:11:48 +03:00
Poojawa f3ab2c57d4 yey, working and in the loadout, though it fucks with the formatting 2018-03-07 02:44:50 -06:00
Poojawa 57bd3824a4 fixes things and mentors. 2018-03-06 23:34:54 -06:00
Zna12 09c840d291 Woops.
I wasn't paying enough attention, but it added a feature I wasn't intending. This smooths out the feature.
2018-03-06 22:42:02 -06:00
Zna12andGitHub 1fc03bb392 Merge branch 'master' into Biodegradable-Darts 2018-03-06 21:57:23 -06:00
Zna12 05159e8029 Degradable Darts, Citadel Style
Just incase upstream doesn't want my memes.
2018-03-06 21:54:15 -06:00
Poojawa 455ee7e687 modules 2018-03-06 21:45:16 -06:00
Poojawa e07efc29fb stuffs 2018-03-06 20:10:14 -06:00
PoojawaandGitHub 86b11050b6 Citadel's folder's end (#5828)
* ERP, miscreants, clothing

* github pls

* guns, dogborg, areas, vendor

* finishes moving around the last of the stuffs

* cleaned up shit. italics on subtle messages

vore code to modular_citadel too

* updates codeowners and recompiles tgui

because it's a healthy thing to do

* reee, I had that spawner set byond

* cleans up a bad pipe

does the thing I've been meaning to do for a while now as well.

* bumps up xenobio console requirements

inb4 reee

* snowflake commenting
2018-03-06 17:40:48 -06:00
PoojawaandGitHub 6e5131cfc5 Vore code to json and more (#5789)
* Vore 2.0

Initial commit

* double checked porting

* Fixes compile issues

* converts Ash Drake bellies to new system

digs out lingering datum/belly stuff too

* Let's just work on this later

* System operational

* Update preferences.dm
2018-03-06 03:59:31 -06:00
Zna12 954ba91c07 Fucking furries reeeeeeeeeeeeeeeeee 2018-03-05 17:03:33 -06:00
Zna12 d7f3942129 Revert "Modularize modularize modularize"
This reverts commit 8a86cbd307.
2018-03-05 16:55:00 -06:00
Zna12 8a86cbd307 Modularize modularize modularize
Quaaaaaaaaack.
2018-03-05 16:52:25 -06:00
Cameron!andPoojawa 841a4199af Removes MediHound's Noncon Vore (#5738)
* Removes MediHound's Noncon Vore

MediHound once again respects vore preferences, as intended.

To make up for this, they now receive a unique cyborg hypospray with fewer reagents, increased energy costs, and no ability to upgrade.

* Moves Preference Check to New Sleeper-Specific Variable, Buffs Hypo

Rather than using target.devourable, MediHounds now check for a new target.sleeperable preference, which defaults to TRUE.

Also, removed the custom HoundHypo. MediHounds will now get the full borg hypospray.

* Removes unnecessary 5th port code

* Breaks the patch for Bhijn's viewing pleasure

DNM etc

* Still not fixed

* Fixes it again.

MediHound sleeper preference is now a game preference toggle, rather than a vore panel toggle.

MediHounds will not be able to ingest SSD or catatonic players.
2018-03-05 12:33:23 -06:00
Zna12 a28763a6e6 Filet-O-Adisa 2018-03-05 06:51:48 -06:00
MichiyamenotehifunanaandPoojawa 0c0c0a5485 toys and stuff (#5772) 2018-03-04 13:07:42 -06:00
Zna12andPoojawa c3c5f86971 Tacticool sensors (#5740)
* Tacticool Sensors

Tacticool Turtlenecks now have sensors, for those memes that want to wear them on station.

* Atom is screwing with me.

Fixed a rogue indent

* I had this part ignored. Woops.

* Code cleanup 101.

Apparently I didn't need the rest of this.

* Ree

Stupid admin.txt
2018-03-04 11:54:25 -06:00
Zna12andPoojawa 71aa99b197 What blob (#5771)
* What blob?

100% Spaghetti Code

* Silly mistakes made by silly people
2018-03-04 11:54:09 -06:00
PoojawaandGitHub 61b121a4c9 Dogborg fixes, Borg construction animations! (#5725)
* major re-works

* Resting verb in, but the icons don't refresh correctly

* tweaks self heal for engiborgs

* minor fixes

* Fixes borg animation flicker

* ore pup stuff, maybe.

* tweaks from upstream input

* adds the basically useless check for dogborg specific modules

* cleans up code and Scrubpup Animation!

* Update robot_modules.dm
2018-03-04 11:53:48 -06:00
MichiyamenotehifunanaandPoojawa 091fedc72b Adds Pump-Action Particle Blasters! (#5696)
* Adds pump action disablers and more!

* Fixes things, implements in a better way
2018-03-02 20:08:35 -06:00
MichiyamenotehifunanaandPoojawa 9c87deac06 New sprites and inhands for eguns and lasers! (#5741) 2018-03-02 18:32:32 -06:00
LetterJayandGitHub 36b3e13c8c Merge pull request #5697 from Michiyamenotehifunana/Great-Trigonometric-Sprite-Replacement
The Great Trigonometric Sprite Replacement, Phase 1!
2018-02-28 23:53:29 -06:00
Chayse Ramsay 75b978a08b Slimepeople are considered holy creatures and now get healed 2018-02-27 15:12:30 +00:00
Chayse Ramsay ee66a24288 Prayer bead buffs 2018-02-27 15:01:02 +00:00
Michiyamenotehifunana 70be9f3027 Reverts particle blasters, modifies sprites 2018-02-26 22:41:47 +08:00
Michiyamenotehifunana b858e54d03 The Great Trigonometric Sprite Replacement, Phase 1! 2018-02-25 20:10:39 +08:00
kevinz000andGitHub 5971347949 Nerfhammer 2.0 2018-02-24 14:01:02 -08:00
kevinz000andGitHub b631a8dee1 nerfs griefing shits 2018-02-24 09:01:29 -08:00
LetterJayandGitHub 6ce5985f9f Merge pull request #5638 from Citadel-Station-13/upstream-merge-35775
[MIRROR] [READY]Randomized Station Time + Night Shifts
2018-02-24 00:24:47 -06:00
Poojawa 32f66fc5a3 Adds Shock collars back to autolathes 2018-02-23 06:52:41 -06:00
deathride58andGitHub 5bf04475b8 Delete cit_nightshift.dm 2018-02-21 13:09:54 -05:00
Chayse RamsayandPoojawa 863dad8906 Changes the HoP to require Service experience (#5618) 2018-02-21 09:32:10 -06:00
LetterJayandPoojawa 8483f94d5f Blood Red Tie - Donator Loadout (#5579)
* donation item

* path cleanup

* ditto

* Update __donator.dm
2018-02-18 19:37:10 -06:00
cebutrisandPoojawa fb43a6d0e9 Gives mineral storage access to those who need it (#5478)
* Gives material storage access to those who need it

* Update engineering.dm

* reee tabbing

* Update tgstation.dme
2018-02-18 19:26:39 -06:00
deathride58andPoojawa 0e9125eeaf makes lighting a little fancier (#5576) 2018-02-18 19:26:15 -06:00
deathride58andPoojawa af759e9849 reduces base rnd point generation rate to 1,200 points per minute (#5558) 2018-02-18 19:20:44 -06:00
PoojawaandGitHub 8b529bcd6b Buffs door security. (#5574)
* Buffs door security.

* a n n o y i n g

* oh right, obj not wires
2018-02-18 19:20:26 -06:00
deathride58andGitHub 2e2e1cb1bf Merge pull request #5484 from Poojawa/emag-usage
Emag limits
2018-02-18 23:26:44 +00:00
Chayse RamsayandGitHub 0b42003f53 Merge branch 'master' into QM-as-Head 2018-02-18 03:46:35 +00:00
Zna12andkevinz000 1585de0687 [Ready to merge] Au-toy-lathe (#5534)
* Autoylathe Complete.

All the errors with the autoylathe should be fixed for now

* Toylathe Tweaking and plastic's initializing.

Well, this gets plastics halfway there. The toylathe now has 8 categories to choose from and some other sutff. It's all coming back.

* TOY LATHE NOW ACCEPTING PLASTIC

TOYLATHE IS WORKING AND RUNNING PROPERLY. SOME GUNS HAVE BEEN ADDED AND WILL NEED MORE TIME TO ADD MORE GUNS.

* Toy Datum construction.

Building some datums for the toys for the autoylathe to print.

* Toys toys toys

Adding toys to the list woo

* Autoylathe complete.

Holy shit it's fucking done.

* Fixes a duplicate id.

Also adds some shit to the hacked list.

* Okay this shit needs to stop

Rogue indentations? Nani?

* ugh

fuck

* Rogue indents

* Power issues

Fixes power scaling and the draining an APC

* Rogue File deletion.

Part of an early experiment that didn't work out.

* Some other tweaks and shit

Moves datums to the autoylathe designs and also fixes a dumb mistake I made.

* Clamps?

Added a clamp. Who knew?

* Shit.

Won't compile if it keeps looking for a file that doesn't exist

* Woops

Deleted a line not paying attention

* reworked initialize

I think I did this right.

* Revert "reworked initialize"

This reverts commit 649c156baebd64b6cd84e95f2f4c3cbd70dabce7.

* Odd variables that don't have any other references in the coding.

Why are these even here? Seriously.

* UNUSED VARIABLE?!

NANI?! Deleted. Don't need em.
2018-02-17 17:18:22 -08:00
LetterJayandGitHub 641af8166b Merge pull request #5452 from cebutris/crazycatgirls
Adds in special fluff items for TechnicalMagi
2018-02-17 18:45:27 -06:00
PoojawaandGitHub c0850044a7 Flightsuit Armor adjustments (#5515)
* armor tweaks

* marks the nerfs for future generations to respect.

* Modularizes values

flags are still getting trimmed tho.

* reee
2018-02-17 18:05:26 -06:00