Commit Graph

57 Commits

Author SHA1 Message Date
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
Michiyamenotehifunana
c8468ed7a7 Adds CMO's Turtleneck! 2018-02-04 23:31:07 +08:00
Poojawa
d7659ac6b2 sync with master 2018-01-31 07:02:55 -06:00
LetterJay
5ff485d4bf Merge pull request #5182 from improvedname/packs
Adds kinkmate refill packages to cargo
2018-01-31 04:06:57 -06:00
Improvedname
3db7412fb7 adds loudout stuff... 2018-01-30 15:10:04 +01:00
Improvedname
ac17f58d3d adds kink refill packs 2018-01-29 21:00:32 +01:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178)
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
2018-01-29 04:42:29 -06:00
Poojawa
d1a07c4d3e Appeases Bhijn. Booty call requested. 2018-01-26 09:28:36 -06:00
deathride58
a1aa60188c Merge pull request #4907 from Vivinet/Potat-OS
Craftable Intellicard Alt: Potat-OS
2018-01-18 23:05:21 +00:00
LetterJay
91299a6152 Merge pull request #4838 from deathride58/loadoutsystem
[READY FOR TESTMERGE] Ports Hippie's loadout system
2018-01-18 15:32:00 -06:00
Vivinet
1cf142a7e4 Craftable Intellicard Sprite: Potat-OS
- Adds the Potat-OS, a Portal inspired way to card AI's! Functionally identical to the intellicard, now with a %100 more starch.

- Crafted using a cable coil, a metal rod, an intellicard and a potato and found in the robot crafting menu.
2018-01-17 21:28:06 -08:00
deathride58
e22b022e98 Merge pull request #4902 from Vivinet/Vivinet
Mining Droid + Borg Tank Tread Movement
2018-01-18 04:59:24 +00:00
deathride58
5fd8606a3f migrates donor items to loadout system, comments out handle_roundstart_items, plus fixes 2018-01-17 17:19:54 -05:00
Vivinet
87c1f34536 Requested changes and then some
- Moved all modified sprites to modular_citadel, made overrides for sec-tread and eng-tread, reverted original robots.dmi

- Added open cover states to modular_citadel robots.dmi

- Removed light found on normal engi-borg sprite that was not on the tread version.
2018-01-17 13:03:57 -08:00
Vivinet
4d05dc1829 Mining Droid + Borg Tank Tread Movement
- Adds the mining droid sprite to the default mining borg module selection.

- Adds movement states for both security and engineering tank tread sprites.

- Fixed static security tread state sprite.
2018-01-17 11:52:47 -08:00
theTiji0
1dcdb82a25 minor touch ups and cleaning up the files 2018-01-16 16:41:51 -05:00
deathride58
b74518a24a adds more loadout equipment, adds working ckey whitelist system, and more 2018-01-16 16:23:22 -05:00
theTiji0
ffec849631 ghosts can now control these bastards 2018-01-16 00:17:58 -05:00
deathride58
b55a497ffc IT WORKS! its testmergable, just gotta add in a ckey whitelist system and add casual friday, then its good 2018-01-15 01:02:35 -05:00
theTiji0
0e33f5b6de Banana spiders are now available through botany. 2018-01-14 22:50:06 -05:00