cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-01-17 12:35:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,275 Commits 61 Branches 14 Tags
d524b4acdeaa574f63503c8212184c5e7e94de84
Commit Graph

147 Commits

Author SHA1 Message Date
bgobandit
b48129203e clearer var name per aranclanos and mso. also porn 2015-10-14 20:36:11 -04:00
bgobandit
95988191d8 Sets proper covered body part flags for adjusted jumpsuits. 2015-10-14 19:36:57 -04:00
Tokiko1
cd885e350d Sprites slightly improved to match similar existing clothing sprites. 
Removed yellow and green versions to address concerns about these being too common and replacing jumpsuits entirely.
 2015-09-27 03:32:29 +02:00
Tokiko1
6da0ee911e Adds blue, red, green and yellow female clothing to the ClothesMate. 2015-09-24 13:26:32 +02:00
bear1ake
c52c4a5346 Merge remote-tracking branch 'tgstation/master' into point-zero 
Conflicts:
	code/modules/research/protolathe.dm
 2015-09-12 21:07:40 +09:00
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
bgobandit
77405d49b0 Tweaks numbers upward. 2015-09-02 14:15:42 -04:00
bgobandit
020ea5d262 Adds materials to some items for recycling purposes. 2015-08-30 14:28:56 -04:00
phil235
13e561e3e8 Fixes bartender uniform not appearing in security record photo. 
Removing bar_suit icon in uniforms.dmi because it's identical to "barman"
Replaced instances of "ba_suit" and "bar_suit" with "barman" (so that the bartender uniform icon names follow the same pattern as other job uniforms ("chef", "captain", "hos", ...)
 2015-07-31 16:20:21 +02:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
phil235
a39effd14c Merge pull request #10193 from Cheridan/what_a_fluke 
Suit Sensor Fixes
 2015-06-29 17:32:44 +02:00
Ikarrus
8759f56f6f Squashed Commits 2015-06-27 00:09:16 -06:00
Cheridan
9f95965abf Suit Sensor Fixes 
-Chameleon jumpsuit sensors now start off
-Fixes unreported(?) bug where prisoner jumpsuits would start randomized when they are supposed to be always-on.
 2015-06-26 17:15:19 -05:00
Ikarrus
46a5e578e4 Gang Update: Fashion War Edition 
This update primarily deals with gang outfits and expands on how they affect the round.
 2015-06-18 20:01:57 -06:00
Firecage
5962b1b449 This fixes the issue of colored jumpsuits not being dyeable into rainbow jumpsuits. 2015-05-15 16:39:20 +02:00
kingofkosmos
de280c72b5 Removed some more spans from visible messages. 2015-04-24 21:06:59 +03:00
phil235
081bae6740 Fixes broken ui action button for toggling chef apron's sleeves and owl's wings. 
Fixes surviving suicide
Fixes suicide damage overlays.
Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect)
Fixes ninja smoke bomb count.
Fixes dead shaved corgi
Fixes lipozine still being in code.
Fixes flattening boxes requiring them to have their window opened.
Fixes armor softening message from disarm attack.
Fixes player being forced to play spiders without choosing.
 2015-04-14 13:54:36 +02:00
Wolfie13
22deb5b46e Added Description Text for Pet Collars 
Because we know they're not some sort of space-tie.
 2015-04-09 04:15:38 +01:00
kingofkosmos
2e4a8fcce8 Recieve --> receive grammarfix 
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.

Fixes #8576
Fixes #8504
 2015-04-03 19:42:34 +03:00
Fayrik
4f43fff199 Issue fixes! All that, and more! 2015-03-29 03:54:41 +01:00
Swag McYolosteinen
53e40ec315 Merge pull request #8427 from Cheridan/day3_collars 
Event Day 3 - Pet Collars!
 2015-03-22 19:37:12 +01:00
Cheridan
e5c3d421db Adds renaming, Adds collars to pet crates 2015-03-22 13:16:30 -05:00
Miauw
521820f289 Makes the white dress a suit. 2015-03-22 19:13:15 +01:00
Miauw
e5637301ba Adds a jester suit and a white dress, both by Nienhaus. 2015-03-22 19:12:25 +01:00
Cheridan
f180506a2d finished 2015-03-18 23:59:23 -05:00
Cheridan
7149f0382d Adds Pet Collars! 
Map needs update now
 2015-03-18 21:27:21 -05:00
Incoming
0d2837935b Adds absolute territory 2015-03-18 17:13:50 -04:00
MMMiracles
1b1ee50b00 ASS BLAST USA USA USA USA 2015-03-09 17:50:37 -04:00
dannno
9b1fa2479b conflict fixing + changelog 2015-02-26 16:48:11 -05:00
dannno
44ea489940 THE OWL RETURNS: PART 2: REVENGE OF THE GRIFFIN 
- adds The Griffin costume to the autodrobe
 2015-02-23 17:30:17 -05:00
dannno
e8fb3d1f05 THE OWL RETURNS: PART 1: THE PLASMA RISES 
- all owl items resprited
- owl wings added; suit slot item, wings are toggleable
 2015-02-23 16:49:17 -05:00
Remie Richards
5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite. 
Items reset their pixel_x and pixel_y values on pickup.
 2015-02-19 13:02:43 +00:00
Incoming
c2c015a91a Fixes conflicts, fixes casually worn uniforms looking weird 2015-02-15 13:07:06 -05:00
Incoming
6811835f41 Modifies the fitted var to allow for clothing that looks good with female uniform generation save for the dickpixel(tm), FEMALE_UNIFORM_TOP. 
Reclassified uniforms as needed. Most uniforms can now get some sort of variation without any sort of visual weirdness.

Uniforms with "enhanced" chests continue to be excluded for that very reason, ironically.
 2015-02-10 17:56:55 -05:00
TZK13
d78322bb42 Adds new schoolgirl uniform colours and adds ties and black skirt to clothesmate. 2015-02-10 06:47:13 -06:00
TZK13
b3f164e131 Ports plaid skirts from Baystation12. 2015-02-10 06:10:26 -06:00
paprka
c527491f41 Merge branch 'master' of https://github.com/tgstation/-tg-station into clothessec 
Conflicts:
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
 2015-02-05 17:44:22 -08:00
TZK13
01bf5b343f Adds purple shorts. 2015-02-04 01:23:58 -06:00
paprka
890b3800e6 some clothing changes 2015-02-03 09:00:51 -08:00
phil235
1401c8043b Fixes cargotech jumpsuit onmob sprite (revert the sprite to the old grey+lightbrown one) 
Fixes a couple jumpsuit not having the wrong or no inhand sprite.
 2015-01-19 21:14:43 +01:00
paprka
a2fe7f0352 bloat killer 9000 2015-01-17 16:36:27 -08:00
dannno
3dc5a04038 Merge branch 'master' of https://github.com/tgstation/-tg-station into bandanno's 
Conflicts:
	config/admins.txt
 2015-01-12 15:55:51 -05:00
dannno
f8573ba257 u know what it is 2015-01-11 16:08:21 -05:00
paprka
88e124e88c Revert "Adds Nien's HoS formal sprites so they dont look like a Prince suit." 2015-01-07 09:12:39 -08:00
Miauw
2a71a8ee12 Merge branch 'master' of https://github.com/tgstation/-tg-station into newhosjumpsuit 
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/modules/clothing/under/jobs/security.dm
	code/modules/clothing/under/miscellaneous.dm
	code/modules/clothing/under/ties.dm
	icons/mob/head.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/uniforms.dmi
 2015-01-07 14:59:24 +01:00
paprka
d57256cf11 makes the second cook spawn in short order clothes, fixes chef uniform 2014-12-28 01:12:49 -08:00
tkdrg
96237278fa Merge branch 'master' into meido 
Conflicts:
	code/modules/clothing/under/miscellaneous.dm
	icons/mob/uniform.dmi
	icons/obj/clothing/uniforms.dmi
 2014-12-25 12:41:29 -03:00
Mandurrrh
0b16835c47 New Dresses and resprited Black Tango Dress 2014-12-22 18:23:11 -05:00
tkdrg
359c5896ed Merge remote-tracking branch 'upstream/master' into meido 
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
 2014-12-22 16:19:43 -03:00
tkdrg
f1101f77a9 Adds 3 more scarves 
These striped scarves are made by MrSnapwalk. They are included in the
ClothesMate along with the other scarves (sprited by Nienhaus). These
have a striped texture.
 2014-12-19 00:24:01 -03:00