Commit Graph

1065 Commits

Author SHA1 Message Date
Poojawa
773a94dea6 I really dunno at this point, weh 2019-04-17 06:28:07 -05:00
Poojawa
fe6407d00c I need to do something else for a bit pending reviews 2019-04-17 04:33:56 -05:00
Poojawa
73098574b7 what to do when footprints are being a bitch.
why, we get rid of them :honk:
2019-04-17 01:18:21 -05:00
Poojawa
a772f532c3 Synthetic and RNG blood 2019-04-16 04:28:04 -05:00
Poojawa
8862d63d0c Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-04-15 14:37:14 -05:00
Poojawa
33c41e80c0 pretty sure I'm onto it 2019-04-13 04:33:40 -05:00
Poojawa
5f1db72ba3 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-04-13 02:47:34 -05:00
Poojawa
fb234783a7 muzzle-compatible helmets and masks 2019-04-12 04:00:47 -05:00
Poojawa
60920fb449 Synthetics blood and greyscale blood effects 2019-04-06 20:05:10 -05:00
Cyprian
644a5a1e66 Berettide! 2019-04-06 22:52:26 +02:00
Poojawa
d8312ec5ae Medical belt overlays + hypo storage 2019-04-04 18:38:34 -05:00
kevinz000
fc7e67ebcb Merge pull request #8183 from Seris02/master
adds bluespace bio bags
2019-04-02 05:34:27 -07:00
deathride58
d22031c33d Merge pull request #8168 from BlackMajor/master
Changeling powers now have HUD icons
2019-03-31 21:22:38 -04:00
deathride58
21682f951e Merge pull request #8159 from Poojawa/lizard-hyperoxia
Carbon Oxygen Toxicity
2019-03-31 21:20:57 -04:00
Seris02
c91fd98fb0 adds bluespace bio bags 2019-03-31 15:13:01 +08:00
BlackMajor
583bfdc66a Ling HUD icons
Adds a shit load of HUD icons for changeling actions.
2019-03-24 23:34:49 +13:00
Poojawa
c8cd7d89b6 fixes overbright digi legs on lizards
also removes their excessive snouts to stop being abominations
2019-03-21 15:31:07 -05:00
Poojawa
0ffa3f6670 carbon Oxygen toxicity 2019-03-21 15:05:58 -05:00
Amatsu Darkfyre
2d286e525d Changes Adamantine Suit's armor values to not be bad.
Also recolors the Slime Mask so it's more obvious at a glance what it is.
2019-03-10 15:10:07 -04:00
Amatsu Darkfyre
54a9b3206f Updates in response to feedback from Bhijn. Also adding in missed icons from my first sweep and renamed _corecross.dm to __corecross.dm. 2019-03-08 17:22:40 -05:00
Amatsu Darkfyre
575c7ebeba Adds Chilling effects to Slime Crossbreeding, along with their icons and proper DM files. Nothing is modularized, as this is all content from upstream, so there should be no upstream conflicts when or if a sync occurs. 2019-03-08 04:02:21 -05:00
kevinz000
21d6412104 Merge pull request #8050 from TrojanCoyote/master
Adding a plush
2019-03-01 02:24:38 -08:00
Nope
aaeedd1ffa Adding a plush
burgit fuckin add this reeeeeee /obtuse/
2019-02-26 18:55:08 -06:00
Cyprian
456d998ad5 Adding a donut 2019-02-25 16:26:52 +01:00
Poojawa
b393789f19 Character Creation Overhaul (#7987)
* Rebase fail. good thing I made back ups. c:

* Tails more or less done

* wouldn't update cleanly otherwise

* It's completly working now. holy fuck I did it

Just need the refurbished body markings done, then to chop 'em up for full PR status

* MARKINGS DONE AAAAAAAAAAAAA

* fixes digi legs that didn't convert correctly

* ports the refractored preferences

Kinda ugly now tbh. but fuckit

* quality sweep, things should should properly now in general

* Taurs converted and improved! BODYMARKING -> MATRIXED

* oops. s'what I get for not compile checking

* remember to throw shade at furries

* vigorously update markings upon switching species and colors

* re-adds old wolf ears, Big Wolf fixes snout bugs

* few more snout tweaks

* cut the lists, cut everything. reeee

* This code I s2g

* Adds context clues to preferences

Hopefully people will read them before making an OOC fuss

* Fixes hands and feet markings with this one weird trick

remember kids, proper layering and order of operations is important

* Sprite tweaking and polishing

Sergal stuff being worked on

* a few QoL things for species swapping

* how the fuck did I miss these markings

* fleshes out sprites in preperation for marking experimentation later

* fixes catboy problems

* Mam_snout is a thing now,

* pixel adjusted tails, cleaned up wah tail a bit better

also gets digitgate legs missing pixels fixed

* cleans up more shit. ree

* force "plain" instead of none to avoid missing pixel reports

* tweaks to reinspire mapdiff

* Clean up Preference UI

Looks a little better now

* k

* doubly ensure None markings aren't valid

* reee spessman barbie

* brightens pixels around tiger head markings

* YEENS

* Cat ears tweaked because it triggers Kev otherwise

* another session of quality control

* Crows and crow accessories

* husk fixes

* works good enough, mission accomplished

* fixes the proc properly

* cleans up brute force code that isn't needed

* c a t
2019-02-22 05:59:05 -08:00
deathride58
69db11e747 Merge pull request #8028 from BlackMajor/master
FUCK (Speedmerge plz)
2019-02-20 19:51:31 -05:00
BlackMajor
778c87545c FUCK
Gay typo
2019-02-21 13:30:31 +13:00
deathride58
59a982466f Merge pull request #8022 from BlackMajor/master
Plushtide 2: Electric Boogaloo
2019-02-20 19:21:34 -05:00
BlackMajor
10244cd3b1 Plushtide 2
More plushies, /random plush spawner.
Some more dumb sounds.
2019-02-20 01:36:38 +13:00
kevinz000
eead9b6eaa viola donator hairstyle 2019-02-15 08:24:31 -08:00
NopemanMcHalt
78dca7552e Adds two crusader variants for chaplain (#7979)
* More crusader armor variants to pick from

Not modularized.

* Makes armor name generic/same with exception of horned and winged helmets

* goddamn it fucking hell what the shit AAAAAAAA

New crusader armor is now digitigrade compatible, also fixes digitigrade templar armor.
2019-02-05 18:15:12 -08:00
Zargul
a201c29697 Fixing Star Trek DS9 uniforms (#7968)
Fixing the the mix-up of the DS9 uniforms. Command is now red, gold is now ops/security.
2019-02-05 18:08:13 -08:00
Tupinambis
e5e97302d4 Adds a new security level: Amber (#7976)
* Adds the Amber security level.

* This isn't C
2019-02-05 17:53:58 -08:00
BlackMajor
eb0d9ba63b Adds the plushtide. (#7972)
* Plushtide is now

Adds plushies, puts them in arcades and cargo crates. Adjusts cargo crate cost to 1500.

* Small adjustments

Sounds were too quiet, robot misnamed

* Small typo fix

scruppuppy -> scrubpuppy
2019-02-04 00:28:47 -08:00
deathride58
a81474a786 Merge pull request #7964 from CydiaButt13/lampstuff
Adds a Lamp Plushie
2019-01-26 00:05:21 -05:00
Cydia
c860a797fd Adds a Lamp Plushie
Little lamp plushie, click clack.
2019-01-24 22:28:28 -06:00
LetterJay
87dee7ff83 mime overalls - donator 2019-01-05 11:01:21 -06:00
deathride58
9ee2d94ab2 Merge pull request #7831 from Citadel-Station-13/ball_stuff
[No this is not just for testmerge]Adds the required assets for the ball map
2019-01-03 08:00:03 -05:00
LetterJay
1db9e44f5b Adds two donation items 2018-12-28 10:09:42 -06:00
kevinz000
1034a6ad0e ball stuff 2018-12-16 03:41:37 -08:00
Ragolution
8dd8fb4167 Update drinks.dmi
Adds new icon for glass of eggnog as state nog3
2018-12-14 01:41:45 -05:00
nik707
cae30f90ad Merge pull request #7799 from R3dtail/new_carpet
Added Another new carpet, and two tables, a new cargo crate, and two new medals.
2018-12-10 16:45:38 -06:00
Redtail
4c7075f1a8 New medals added.
add:  Two new medals for engineering and medical to give out.
2018-12-08 12:12:36 -06:00
Redtail
629189fdc1 Added Another new carpet, and two tables, and a new cargo crate.
Added:  monochrome.  Two new table sprites for the other new carpet.  New cargo supply crate for the two new carpets.  Changed:   the name of the new carpet to "blackred" so it would avoid confusion with the original carpet.
2018-12-07 22:48:46 -06:00
deathride58
6c5694ce0c Merge pull request #7780 from Ignari-Coldstorm/Premium-KPA
Adds a new PKA to the mining Vendor
2018-12-03 11:20:37 -05:00
nik707
036757488d Merge pull request #7783 from R3dtail/new_carpet
Added a new carpet
2018-12-02 21:52:03 -06:00
Redtail
e339bcd2ca Added a new carpet
Worked on adding a new carpet.  It isn't -finished- yet and Trilby is going to help look over what I've done so I can make this work.
2018-12-01 20:21:18 -06:00
Ignari_Coldstorm
55517ae329 Adds a new PKA to the mining Vendor
Miners are always going and saying that they amass so many points while mining, yet nothing is worthwhile enough to buy with said points so they sit there wasted usually. This adds a new premium Kinetic Accelerator with stronger base stats, meanwhile it costs 8K mining points. Will later be adding premium edition of Kinetic crusher. Ideal goal is to encourage miners to mine enough ore for station to get this gear before they go out to hunt for real.
2018-11-30 20:18:49 -06:00
deathride58
4e88980cf5 readds the kitchen gun sprite (fixes the kitchen gun being invisible) 2018-11-21 01:56:20 -05:00
Bear
c6ce774327 what a gas 2018-11-01 22:35:18 -04:00