Commit Graph

394 Commits

Author SHA1 Message Date
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
deathride58
d2e13833d6 Merge pull request #5496 from Citadel-Station-13/upstream-merge-35339
[MIRROR] Support stations with multiple z-levels
2018-02-17 21:24:48 +00:00
deathride58
6a7d414fdf fixes compiling errors hopefully 2018-02-17 15:57:34 -05:00
Poojawa
a7b1b5cbdf Adds cryo area and boxstation goodies 2018-02-14 16:26:38 -06:00
Cebutris
440e39ed68 limits the hallucinations a little 2018-02-12 22:15:53 -05:00
Cebutris
d0fa073a5d adds in a hallucinogenic collar and a dirty sweater 2018-02-12 21:57:24 -05:00
Michiyamenotehifunana
440e102b34 Fixes and reimplements mag weapons
GREAT FUCKING JOB KEVINZ
2018-02-11 12:12:43 +08:00
CitadelStationBot
85c2f56beb Merge pull request #5323 from Raeschen/Raes_miscreanttweak
Changed/removed some miscreant objectives.
2018-02-09 07:47:09 -06:00
Nick
8ef7eea4fa Merge branch 'master' into bunnypack 2018-02-09 07:10:12 +01:00
Improvedname
464077ef3a bunni 2018-02-08 20:31:26 +01:00
Raeschen
a02a187039 changed out-comments to deletes 2018-02-08 09:41:50 +01: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
Michiyamenotehifunana
6c18b55e67 Fixes the Mk.37F ejecting broken foam dart "casings" (#5336)
* one pump chump

* 0 and 1 what is their point of intersection?
2018-02-06 19:07:51 -06:00
Raeschen
3083fc82f0 Changed/removed some miscreant objectives. 2018-02-05 19:39:26 +01:00
Poojawa
03b33075e5 Mentor System (#5235)
* reworked mentor system, again. wew

* Update admin.txt

* uhg
2018-02-05 04:09:56 -06:00
Poojawa
b086691e54 Update cit_guns.dm 2018-02-05 03:02:29 -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
Poojawa
ed72d175c8 actually no, let's just do this 2018-02-03 10:34:42 -06:00
Poojawa
1bc69ec9b2 Vore alterations 2018-02-03 10:28:27 -06:00
Poojawa
4f8153ce69 FINALLY FIXES BORG ITEM BLACKLIST AAAAAAAAAAAA 2018-02-03 09:03:03 -06:00
Poojawa
5680a33004 If you're having trouble, move the priority check higher 2018-02-01 22:31:42 -06:00
Poojawa
e0703fcecc Removes Fun 2018-02-01 21:39:30 -06:00
Poojawa
ea5fff30bf refractors genital overlays to mutable_appearance 2018-02-01 12:54:45 -06: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
Poojawa
67ac5abfaa properly aligned you fucking tit. 2018-01-30 15:29:02 -06:00
Poojawa
a24788842b dogborg tweaks, so fuggin DUMB (#5202)
* apparantly you need shuttles, who knew

* some tweaks

Sprites need adjustments
Janidogs need adjustments in UI

* Hm, maybe a fix. Revert attempt to rename sprites

* [MIRROR] Better Chat Squashing (#5193)

* Merge pull request #35058 from uraniummeltdown/chatsquash

Better Chat Squashing

* Better Chat Squashing

* [MIRROR] Sexy Solar Sprites (#5191)

* replaced solar panel sprites with better ones

* Sexy Solar Sprites

* Automatic changelog generation for PR #5191 [ci skip]

* [MIRROR] New Coffin Sprite (#5190)

* coffins have a new sprite (#34995)

* New Coffin Sprite

* Automatic changelog generation for PR #5190 [ci skip]

* [MIRROR] Makes fire colorful and anime (#5187)

* Makes fire colorful and anime (#34977)

* - Makes fire colorful and anime

* - Updates light color on fires
- Makes fire update color less often (1/7th as often)

* - Changes the transition from blue to purple to be much more gradual, it starts at 40000 and peaks at 120000 Kelvin now
- Changes fusion fire (>4 million Kelvin) to have a slight colorshift to it (It's just the druggy overlay).

* - Moves fire above gas (and everything else)
- Changes fire alpha for low temperature fires to compensate for items no longer rendering on top of fire

* - Makes the new fire layer a define and makes sure it isn't above "Hyperspace Ripples" whatever that is

* - Removes comment

* - FIRE_LAYER is already defined for burning humans.

* Makes fire colorful and anime

* Automatic changelog generation for PR #5187 [ci skip]

* [MIRROR] Expand Cyborg (#5183)

* Expand Cyborg (#34958)

* Expand Cyborg

* i ded pls nerf

* Oh sheet

* Expand Cyborg

* Automatic changelog generation for PR #5183 [ci skip]

* [MIRROR] Cosmic Bedsheet (#5170)

* adds cosmic space bedsheet

* Cosmic Bedsheet

* [MIRROR] The punisher no longer punishes ticker subsystems with delayed fires (#5174)

* Merge pull request #34964 from MrStonedOne/patch-463

The punisher no longer punishes ticker subsystems with delayed fires

* The punisher no longer punishes ticker subsystems with delayed fires

* Fuck this I'm done with it
2018-01-30 15:17:46 -06: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
Nick
8440d0e6fd Update cit_vendors.dm 2018-01-29 04:01:34 +00:00
Nick
529cf64ab9 Kinky mai boy 2018-01-29 03:40:35 +00:00
Jordan Brown
8261e15126 Fixes the mapdiffbot issue 2018-01-28 21:18:21 -05:00
deathride58
3d0d1bd06a Merge pull request #4097 from deathride58/theprthatbulliesjanitormains
[READY] Makes walking on tiles slowly make them dirty, similar to Baystation, and adds footstep sounds (Featuring sounds from CEV Eris!)
2018-01-18 06:28:04 +00:00
deathride58
8c743141da Merge pull request #4721 from deathride58/genitalexamine
Exposed genitals will now add details onto examine text
2018-01-18 04:56:50 +00:00
LetterJay
72a9030f6a donate fix 2018-01-12 20:05:50 -06:00
LetterJay
946d0243ce donation item fix 2018-01-11 20:37:54 -06:00
LetterJay
7c2662f1de custom item 2018-01-11 15:25:47 -06:00
deathride58
9fd87720ae Reduces detail in some genital descriptions, makes breasts only leak when aroused 2018-01-08 21:52:06 -05:00
deathride58
b3ff238cb8 you can now examine people with exposed genitals to see details 2018-01-08 20:45:08 -05:00
deathride58
ed2cf5e164 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into theprthatbulliesjanitormains 2018-01-08 15:44:05 -05:00
LetterJay
5486f71010 woo 2018-01-01 07:30:50 -06:00
cebutris
8c6d660611 adds functional cebusoap 2017-12-30 10:04:03 -05:00
LetterJay
1047dccdd5 fk 2017-12-29 01:20:09 -06:00
LetterJay
1a2ccbbd53 Merge branch 'master' into theprthatbulliesjanitormains 2017-12-22 02:56:10 -06:00
LetterJay
30796ad342 Update cit_arousal.dm 2017-12-19 17:56:06 -06:00
Michiyamenotehifunana
e77c1a8a07 Consolidates NEB code into a modular package 2017-12-15 16:57:22 +08:00
deathride58
bf61f55b25 Fixes donator items not rendering properly when worn 2017-12-12 20:16:51 -05:00
CitadelStationBot
cc0b768c72 [MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES (#4014)
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES

* resetting all the maps because we can worry about them later.

* Regexing

* I'm fucked

* Fixes

* .

* maps

* bleh

* ree

* fixes
2017-12-11 16:36:38 -08:00
deathride58
742d50b5e7 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization
# Conflicts:
#	code/citadel/custom_loadout/custom_items.dm
#	code/datums/components/riding.dm
#	code/game/objects/items/implants/implantuplink.dm
#	icons/mob/neck.dmi
#	icons/obj/clothing/cloaks.dmi
2017-12-08 19:58:41 -05:00