Commit Graph

15939 Commits

Author SHA1 Message Date
KasparoVy
0ded1a2e63 Corrects Oversight & Fixes a Bug w/ Roundstart Disabilities
The roundstart disability bug is my own doing from PR #7019 and reported
in issue #7369.
The other line changed was an oversight-- a place I should've used the
CAN_BE_FAT flag but didn't, and thus an inconsistency that I felt right
to correct in this pass.
2017-05-21 16:02:42 -04:00
Crazy Lemon
41181f9296 Merge pull request #6752 from Kyep/remap_centcom
CC Map Updates
2017-05-20 14:53:48 -07:00
Crazylemon64
4936a18e70 Merge branch 'master' into remap_centcom 2017-05-20 14:40:03 -07:00
Crazy Lemon
a48092424b Merge pull request #6774 from FlattestGuitar/jobban
Adds a jobban checking verb. 🔨
2017-05-20 13:44:41 -07:00
Crazy Lemon
c10536cba5 Merge pull request #7011 from Kyep/playtime_for_roles
Adds playtime requirements for antag roles
2017-05-20 13:12:00 -07:00
Crazy Lemon
8d7b2b7807 Merge pull request #7019 from KasparoVy/autoaccent-pref
Turns Auto-Accent into a by-character Preference, Desnowflakes Preferences.dm
2017-05-20 13:07:34 -07:00
Crazy Lemon
42b8a66b93 Merge pull request #7166 from tigercat2000/title_screens
Serverside titlescreen icons.
2017-05-20 13:00:24 -07:00
Fox McCloud
a572f59d5d Merge pull request #7353 from Crazylemon64/sallet_adjustment
Steel Sallet now copies attributes of the item it was made from
2017-05-19 17:57:20 -04:00
Crazy Lemon
a365a0dede Merge pull request #7014 from SamHPurp/coroner-role
Adds Coroner role in its own right
2017-05-19 14:41:15 -07:00
Crazylemon64
c10300b8e2 Steel Sallet now copies attributes of the item it was made from 2017-05-19 13:52:11 -07:00
Fox McCloud
f7aa7f4fce Merge pull request #7255 from SamHPurp/earlier-karma-reminder
Adds a Karma Reminder line while shuttle in flight
2017-05-18 00:28:31 -04:00
Sam
30153387e7 Add Coroner 2017-05-18 01:42:13 +01:00
Sam
b7c87c041b Removes roundend karma reminder 2017-05-18 01:27:10 +01:00
Sam
039a2d07ac Revert "Adds a preference option"
This reverts commit fd850a6e1e.
2017-05-17 23:51:08 +01:00
Crazy Lemon
5c66160210 Merge pull request #6957 from Fox-McCloud/neurotoxin-nerf
Nerfs Neuro-Toxin
2017-05-17 14:45:40 -07:00
Fox McCloud
3d87064025 Merge pull request #7313 from KasparoVy/wtf_snek
Adds Hissing Emote for Unathi
2017-05-17 14:46:57 -04:00
Regen
bb148f23fd Merge branch 'master' into master 2017-05-17 20:33:09 +02:00
Regen
4769557840 Removes the bottle entierly 2017-05-17 20:32:27 +02:00
Fox McCloud
4eb91c5eb7 Merge pull request #7303 from FlattestGuitar/duck-tape
Easier shoe silencing
2017-05-17 02:24:06 -04:00
Sam
9d6ca9b268 Fixes superfluous bracket 2017-05-16 23:46:03 +01:00
FlattestGuitar
e16bcdd511 removes shoe rags, just use tape! 2017-05-16 23:35:02 +02:00
Crazy Lemon
8e00248071 Merge pull request #7312 from KasparoVy/merchant-fluff
Travelling Merchant's Steel Sallet
2017-05-16 13:55:16 -07:00
Fox McCloud
0e7314cc3b Merge pull request #7169 from uraniummeltdown/unfun
Lets you resist out of straightjackets, straightjacketed people can be handcuffed
2017-05-16 08:17:11 -04:00
Fox McCloud
dd3ee12fd9 Merge pull request #6786 from FlattestGuitar/memetor
Makes msay be enabled by default 💬
2017-05-15 19:22:12 -04:00
KasparoVy
6572a5f522 Adds Hissing Emote for Unathi
Original work by TravellingMerchant.
2017-05-14 23:53:07 -04:00
KasparoVy
a8d5eaf497 Travelling Merchant's Sallet
Adds a modkit that can make any non-space helmet look like a steel sallet.
The steel sallet can be adjusted via a UI button and has four states:
- Visor and bevor
- Visor only
- Bevor only
- Neither visor nor bevor

And will obscure the head as makes sense for each state.
2017-05-14 20:57:38 -04:00
Crazy Lemon
0e753b9bff Merge pull request #7309 from TullyBurnalot/HighNoon
Fixe typos with cowboy items
2017-05-14 11:14:50 -07:00
TullyBurnalot
08db7cde49 Fixe typos with cowboy items 2017-05-14 15:06:21 +01:00
TullyBurnalot
c15a7c86a9 Fixes Disposal Bin Light 2017-05-14 14:42:56 +01:00
Fox McCloud
dc1c61bfe6 Merge pull request #7306 from Crazylemon64/controller_reboot_fix
Adds the garbage controller to the set of rebootable controllers
2017-05-13 20:13:21 -04:00
Crazylemon64
3150419b74 Adds the garbage controller to the set of rebootable controllers 2017-05-13 17:04:45 -07:00
Fox McCloud
f52bef5ec0 Merge pull request #7199 from Crazylemon64/controller_reboot_fix
Makes the master controller's auto-restart work
2017-05-13 19:55:03 -04:00
Fox-McCloud
31c9519f3e More GC Define Transitions 2017-05-13 04:24:05 -04:00
Fox McCloud
862a353d46 Fixes Some Diseases Not GCing (#7290)
* Fixes Some Diseases No GCing

* fix this too

* derp, I'm just an idiot

* but we can do this...
2017-05-12 23:21:22 -07:00
FlattestGuitar
530ac1a84e fixes faec 2017-05-13 00:47:51 +02:00
Fox McCloud
afb6ea917a Merge pull request #7284 from Xantholne/Fixes01
Fixes for Western Megapack Clothes
2017-05-12 15:10:15 -04:00
Fox McCloud
35ba1c4991 Merge pull request #7281 from Aurorablade/PeekABoo
thrall check
2017-05-12 15:08:13 -04:00
Aurorablade
f5f338b60c fixes sprites 2017-05-12 10:21:46 -04:00
Xantholne
700eb66061 Changed hint from clothes to uniform because some people might not figure that out. 2017-05-11 21:11:50 -06:00
Xantholne
f5c850b9cf Fixes bornw cowboy boots name, adds hint to the clipon cowboy shirts 2017-05-11 21:02:18 -06:00
Fox McCloud
877b5d8457 Droppers Refactor (#7269)
* Droppers Refactor

* tweaks
2017-05-11 18:53:16 -07:00
Fox McCloud
20ab3ee64d Makes Clothing Accessories, Clothing with Accessories, Blood, and Spiderlings GC (#7272)
* Makes Clothing Accessories and Clothing with Accessories GC

* and spiderlings, apparently

* BLOOOD FINALLY GARBAGE COLLECTS!!!!
2017-05-11 18:50:43 -07:00
Aurorablade
841ef7bcf8 NOPE
..skipface not skipmask..
2017-05-11 01:39:47 -04:00
Aurorablade
88cc7c6113 false tweak 2017-05-11 01:39:18 -04:00
Aurorablade
b2e932c131 thrall check 2017-05-10 23:59:32 -04:00
Fox McCloud
433a2d7cb7 Merge pull request #7125 from Xantholne/WesternMegapack
Adds Western Frontier Pack
2017-05-10 20:30:26 -04:00
Sam
27fc743150 stops overrunning bold tag 2017-05-10 19:49:22 +01:00
Xantholne
5bda45228d Removes codersprite hat, changes pathways, changes names to be more accurrate with hat. Any broken icon state should work correctly 2017-05-09 19:34:10 -06:00
Fox McCloud
a890444f2f Merge pull request #7247 from Aurorablade/FiftyShadesOfGrey
Fifty shades of grey
2017-05-09 01:07:47 -04:00
Sam
fd850a6e1e Adds a preference option 2017-05-08 13:15:28 +01:00