cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,091 Commits 9 Branches 0 Tags
eae29b9d692fdea73b64a2040a3928d73be49f01
Commit Graph

23194 Commits

Author SHA1 Message Date
Leshana
2148ae20d5 Fixes Issue #230 - Void suit body sprites not visible. 
Cause is somewhat complicated:
* Custom vore code in update_icons will use 'item_state' as the icon state if icon_override is set on a suit.
* Suit refit machines will set icon_override on suits if the sprite_sheet_refits variable matches.
* However icon_override is not actually used anymore because of the species sprite sheets.
* Therefore it breaks.  By making this change we ensure that icon_override is not set, so the custom vore code does not apply, and the item_state is not allowed to overrule the icon_state.
 2016-05-27 19:46:06 -04:00
EmperorJon
210d6c87bd Merge pull request #1772 from Yoshax/dressup 
Splits suit jackets and ties from some suits
 2016-05-27 23:59:52 +01:00
Yoshax
f7377a476b Merge pull request #1769 from VOREStation/pretty-secrets 
Organize and Beautify Admin Secrets Panel
 2016-05-27 23:53:29 +01:00
comma
b157ebfbac Breaks up some suits into parts 
-Detective suit with vest (vest, tie)
-Charcoal suit (jacket,tie)
-Burgundy suit (jacket,tie)
-Navy suit (jacket,tie)
-Tan suit (jacket,tie)
 2016-05-27 23:33:54 +01:00
comma
2daedf836b Made ties on some suits detachable 
-Detective suit, grey
-Detective suit, dark
-Lawyer suit, blue,
-IA suit
 2016-05-27 23:18:59 +01:00
Daranz
afcbebfe54 Fix on-spawn captain's medal attaching 2016-05-27 23:02:00 +01:00
Zuhayr
6281516826 Generalizes the accessory system to work for suits. 2016-05-27 23:01:47 +01:00
Leshana
9f699257de Organize and Beautify Admin Secrets Panel 
* Add browser styles to Admin Secrets panel to make it look nice.
* Show only one category at once, with buttons to switch between categories at the top.
 2016-05-27 16:32:46 -04:00
Leshana
396a094fb1 Organize and Beautify Admin Secrets Panel 
* Add browser styles to Admin Secrets panel to make it look nice.
* Show only one category at once, with buttons to switch between categories at the top.
 2016-05-27 16:29:04 -04:00
redstryker
420f2c8463 Adds Tracksuits 2016-05-27 15:19:07 -04:00
HarpyEagle
76d2b3ec99 Fixes doors sparking as if damaged when spawned or created by RCD 2016-05-27 19:24:51 +01:00
SinTwo
8bff04dac0 adds four new hair styles. 2016-05-27 13:43:03 -04:00
Leshana
76df443940 IAN STORM 
Added a new event: Ian Storm.  Yes.
 2016-05-27 13:30:33 -04:00
Yoshax
ce9b4e8109 Adjusts molotovs to be able to use alcohol to set the rag alight 2016-05-27 15:39:35 +01:00
Leshana
219db3d868 Adds preference to mute remote LOOC chatter heard by admins. 
* Lets people remain on standby for adminhelps without having all that spam scrolling stuff off the screen if they are not taking on the role of policing LOOC.
 2016-05-27 15:10:29 +01:00
Yoshax
cbe932d1ed Merge pull request #1746 from VOREStation/constructions 
Fixes Exosuit Fabricator Deconstruction and makes Jukeboxes constructable
 2016-05-27 14:41:46 +01:00
Neerti
abd14db701 Merge pull request #1758 from Yoshax/walls 
Ensures walls spawn 2 pieces of metal when deconstructed
 2016-05-26 22:39:07 -04:00
Leshana
7bd3e1ddd0 Fix the on-mob icon for vulpine belt! Oops! 2016-05-26 21:40:10 -04:00
Leshana
715dbae590 Prevent duplicate components in contents of machines built in-game. 
* Many machines create their default component parts in their constructor.   But machines made in game get the parts from the frame added to them.
* Existing code already partially handled this case by clearing out the component_parts list prior to adding the parts from the frame.  However the list was merely Cut(), leaving the parts still in the contents of the machine.   This bug was not easily visible, becuase there is no in-game way to get the parts back out.
* This fix improves the situation by explicitly deleting the parts instead of leaving them semi-orphaned.
 2016-05-26 21:13:43 -04:00
Yoshax
9ed1f2f495 Adds Cards Against The Galaxy to loadout 2016-05-27 00:48:08 +01:00
Yoshax
61deea28a8 Ensures walls spawn 2 pieces of metal when deconstructed 2016-05-27 00:25:01 +01:00
Yoshax
2624297495 Merge pull request #1757 from VOREStation/stutter 
Fixes Stuttering
 2016-05-26 21:29:36 +01:00
Arokha Sieyes
28ccc4f21c Yeah, that's a typo. 2016-05-26 16:21:11 -04:00
Arokha Sieyes
8e21e09d23 Yeah, that's a typo. 2016-05-26 16:17:23 -04:00
Datraen
ed5baa120e Merge pull request #1750 from Yoshax/towelfix 
Fixes towel hit sound
 2016-05-26 15:44:28 -04:00
Datraen
3d433da315 Merge pull request #1752 from Yoshax/disablefaux 
Allow disabling styling of fake nanoui windows
 2016-05-26 15:44:17 -04:00
Datraen
d73cdc7307 Merge pull request #1751 from Yoshax/tapefix 
Mapped tape rolls can now apply themselves.
 2016-05-26 15:43:37 -04:00
Asanadas
b90e8c68c6 Deepest lore. Change a poster description to match policy. 2016-05-26 18:39:46 +01:00
GinjaNinja32
beee32f237 Allow disabling styling of fake nanoui windows 2016-05-26 18:07:38 +01:00
PsiOmegaDelta
92b97e1d2d Mapped tape rolls can now apply themselves. 
Can be applied to anything as long as it's airlocks. Ensures proper layering, icon state, etc. Fixes #13058
 2016-05-26 17:53:00 +01:00
Yoshax
5ad5206db3 Fixes towel hit sound 2016-05-26 16:48:25 +01:00
Arokha Sieyes
76567bb7a2 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync 
# Conflicts:
#	code/modules/mob/living/carbon/human/whisper.dm

Whisper modified locally, and deleted upstream (in a change I made, so I know it's safe to remove).
 2016-05-26 09:59:18 -04:00
Datraen
4448a6f469 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Slime_Rework_3 
# Conflicts:
#	code/modules/mob/living/say.dm
 2016-05-26 08:20:41 -04:00
Yoshax
77ee2215e7 Removes unused and unnecessary spam prevention 2016-05-26 04:24:18 +01:00
Leshana
3caec84482 Fix copy/paste error duplicating definition 2016-05-25 23:12:56 -04:00
Leshana
844ea7febc Allow building lights on windows. 2016-05-25 21:43:59 -04:00
Datraen
6df5e33e36 Merge pull request #1745 from VOREStation/fixvision 
Followup to blindness fix
 2016-05-25 21:37:07 -04:00
Leshana
e37ac4da3e Fixes #145 - Makes jukeboxes constructable. 
* Adds circuit board.
* Adds design to print board on autolathe.
* Makes jukeboxes deconstructable back to frame.
 2016-05-25 21:35:24 -04:00
Leshana
ca6e75ab8f Fixes runtime error when Exosuit Fabricators are deconstructed. 
* You need to have the circuit be an actual instance, not a path.
 2016-05-25 21:35:14 -04:00
PsiOmegaDelta
b31e6cf757 Fixes #12131. 
Blindness/deafness now check the correct disability var (we have two for some reason, very practical).
 2016-05-25 21:28:31 -04:00
Datraen
f0edb66f9b Merge pull request #1741 from VOREStation/sayupgrade 
Say/Whisper Rewrite
 2016-05-25 21:17:36 -04:00
Yoshax
cfa8db6097 Merge pull request #1743 from VOREStation/fixvision 
Fixes NEARSIGHTED = BLIND
 2016-05-26 02:09:45 +01:00
Arokha Sieyes
487bb7cf96 Fixes ancient typo 2016-05-25 21:01:52 -04:00
Yoshax
87a7cfcbac Merge pull request #1742 from Serithi/Lavender 
Apparently i added the seeds to the wrong seed vendor file.
 2016-05-26 01:54:30 +01:00
Serithi
c4df745933 Better formatting. 2016-05-25 17:45:48 -07:00
Serithi
b7158b5acd Apparently i added the seeds to the wrong seed vendor file. Hoooopefully this is all that's needed now. 2016-05-25 17:24:22 -07:00
Arokha Sieyes
1fed239264 Done w/ testing, block spam again. 2016-05-25 19:51:53 -04:00
Arokha Sieyes
9783848717 Don't forget dead people 2016-05-25 19:26:15 -04:00
Arokha Sieyes
6c04110805 Allows silicons to whisper (mostly used by borgs but I guess an AI could whisper into a radio). 2016-05-25 18:28:11 -04:00
Datraen
3b72b362d7 Fixes #530 2016-05-25 17:11:36 -04:00