Commit Graph

76 Commits

Author SHA1 Message Date
Poojawa
e07efc29fb stuffs 2018-03-06 20:10:14 -06:00
Poojawa
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
Poojawa
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
Cameron!
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
Michiyamenotehifunana
0c0c0a5485 toys and stuff (#5772) 2018-03-04 13:07:42 -06:00
Zna12
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
Zna12
71aa99b197 What blob (#5771)
* What blob?

100% Spaghetti Code

* Silly mistakes made by silly people
2018-03-04 11:54:09 -06:00
Poojawa
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
Michiyamenotehifunana
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
Michiyamenotehifunana
9c87deac06 New sprites and inhands for eguns and lasers! (#5741) 2018-03-02 18:32:32 -06:00
LetterJay
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
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
kevinz000
5971347949 Nerfhammer 2.0 2018-02-24 14:01:02 -08:00
kevinz000
b631a8dee1 nerfs griefing shits 2018-02-24 09:01:29 -08:00
Chayse Ramsay
863dad8906 Changes the HoP to require Service experience (#5618) 2018-02-21 09:32:10 -06:00
LetterJay
8483f94d5f Blood Red Tie - Donator Loadout (#5579)
* donation item

* path cleanup

* ditto

* Update __donator.dm
2018-02-18 19:37:10 -06:00
cebutris
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
deathride58
0e9125eeaf makes lighting a little fancier (#5576) 2018-02-18 19:26:15 -06:00
Chayse Ramsay
0b42003f53 Merge branch 'master' into QM-as-Head 2018-02-18 03:46:35 +00:00
Zna12
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
LetterJay
641af8166b Merge pull request #5452 from cebutris/crazycatgirls
Adds in special fluff items for TechnicalMagi
2018-02-17 18:45:27 -06:00
Poojawa
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
LetterJay
e809725afd Merge pull request #5525 from jakeramsay007/slimepeoplerework
[Ready!] The Slimening - Reworking slimepeople to be less like humans without unbalanced advantages.
2018-02-17 11:51:45 -06:00
Chayse Ramsay
47e9b2fe63 More Requested Changes 2018-02-16 15:52:28 +00:00
Chayse Ramsay
377c116662 Merge branch 'master' into QM-as-Head 2018-02-16 13:09:58 +00:00
Chayse Ramsay
cfe11488b6 Re-adds HoP to the Civilian joblist
Should make them able to be chosen as a job again
2018-02-15 10:15:34 +00:00
Poojawa
01bc7310b6 Cryopods from Oracle Station
It's really nice to have a tg based station that's porting good shit.
2018-02-14 14:06:33 -06:00
cebutris
56e81d3a4f Merge branch 'master' into crazycatgirls 2018-02-14 12:33:45 -05:00
LetterJay
c52562fed3 Update __donator.dm 2018-02-13 12:10:24 -06:00
Cebutris
d54a92ef46 adds the crazy catslut stuff to the loadout 2018-02-12 22:04:44 -05:00
Chayse Ramsay
4d7e9caa52 Goofed on the HoP's arrival announcement channel 2018-02-12 03:03:35 +00:00
Chayse Ramsay
a1116f6dc8 QM is now a Head of Staff, everyone rejoice 2018-02-12 01:52:33 +00:00
Nick
8ef7eea4fa Merge branch 'master' into bunnypack 2018-02-09 07:10:12 +01:00
Improvedname
d2404d3cf7 has 2018-02-09 07:09:10 +01:00
Improvedname
464077ef3a bunni 2018-02-08 20:31:26 +01:00
deathride58
d236b75ca0 adds widescreen pref 2018-02-07 01:42:31 -05:00
Michiyamenotehifunana
389e6de8f5 FINALLY modularizes Polychromic Clothes AND modernizes all polychromic code! (#5269)
* FINALLY AFTER 2 MONTHS

WOOOOOOOOOOOOOOO

* Updates all polychromic code

This makes the default argument of all polychromic color input menus the last chosen color.
2018-02-06 19:08:08 -06:00
theTiji0
2d06c71404 added space kiwis as a new simple mob (#5334)
* added space kiwis as a new simple mob

* Fixed syntax typo

I hate everything
2018-02-06 19:07:31 -06:00
deathride58
0ecb7ad81b Merge branch 'master' into cargonia-is-glorious! 2018-02-06 02:54:58 +00:00
deathride58
d5f703bc58 Merge pull request #5317 from improvedname/Loadout
Organizes job spefific loadout stuff by departments
2018-02-06 02:53:57 +00:00
deathride58
a3649fc6fe Merge pull request #5316 from improvedname/Cargo
Turns the kinkmate resupply crate into an construction kit
2018-02-06 02:53:24 +00:00
Michiyamenotehifunana
acec5bc6ad Merge branch 'master' into Medical-Turtleneck 2018-02-06 07:47:29 +08:00
Improvedname
b7f86583cd CAR GONIA 2018-02-05 20:18:21 +01:00
Improvedname
97f6e98d03 adds suffixes 2018-02-05 15:57:47 +01:00
Improvedname
0e52d3fae3 does the thing 2018-02-05 15:44:40 +01:00
Improvedname
1ea5242cf4 Does a thing 2018-02-05 15:09:41 +01:00
Poojawa
03b33075e5 Mentor System (#5235)
* reworked mentor system, again. wew

* Update admin.txt

* uhg
2018-02-05 04:09:56 -06:00
Zna12
a89e9f20aa Foam-Force Assault Machines. (#5243)
* REEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEE

i HAVE NO IDEA WHAT I'M DOING

* Wew. Managed to add the AM4 to the thingy.

WYSIWYG

* ALMOST DONEEEE

Wew. Just a few more tweaks

* To be reverted.

This is just adding a file of the sprite for the mag so I can work at work

* AM4B Complete, Moving to AM4C

And also I need to make the magazines.

* One step forward two steps back.

Magazine sprites are in. still need to test it.

* Forgot to save a file.

Woops.

* AM4 Finished.

Adds two weapons, the AM4-B and the AM4-C. Yes they're supposed to look like the MA5.

* Reverted those last couple things.

Deleted some loose files that I didn't actually need. Whoops.
2018-02-05 01:23:46 -06:00
Nick
0c07e1de56 [RDM]More loadout stuff (#5253)
* and BOOM SHAKALA

* Update uniform.dm

* hmm

* dedado

* boop

* Be da deem armor values!
2018-02-04 22:29:38 -06:00