Fox McCloud
581fb68bcb
Merge pull request #7343 from SamHPurp/Fixes-superfluous-bracket
...
Fixes a superfluous bracket
2017-05-19 00:08:54 -04:00
Sam
59ac4d4a03
removes a bracket...
2017-05-19 02:13:22 +01:00
Fox McCloud
c43e227448
Merge pull request #7337 from IK3I/Happy-Animals
...
Fixes #7316
2017-05-18 20:09:15 -04:00
IK3I
831f3dd99d
Fixes #7316
2017-05-18 06:50:18 -05:00
TullyBurnalot
ca65b591d8
Addresses Fox Issues
2017-05-18 11:41:56 +01:00
TullyBurnalot
29b0b372fa
Fixes Deaf Listening
2017-05-18 10:35:05 +01: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
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
84fa2ceb93
Merge pull request #7329 from SamHPurp/poster-fixes
...
Fixes poster issues
2017-05-17 14:31:32 -04:00
Fox McCloud
4eb91c5eb7
Merge pull request #7303 from FlattestGuitar/duck-tape
...
Easier shoe silencing
2017-05-17 02:24:06 -04:00
Sam
dab3188c3c
fixes Contraband poster issues
2017-05-17 00:57:59 +01: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
146e3a6540
Merge pull request #7305 from FlattestGuitar/brigerino-kekerino
...
Adds radios and prisoner IDs to prisoner lockers
2017-05-16 06:47:44 -04:00
Fox McCloud
ae352da0ea
Merge pull request #6604 from Kyep/job_security
...
Supports +2 Security Officer slots
2017-05-16 02:09:33 -04:00
TravellingMerchant
d2d1af7270
defines posters
2017-05-16 01:33:47 +01: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
Fox McCloud
195a907ffe
Merge pull request #7123 from SamHPurp/Fixes
...
Fixes
2017-05-15 19:21:01 -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
Crazy Lemon
fc28a3e27c
Merge pull request #7297 from Fox-McCloud/more-gc-defines
...
More GC Define Transitions
2017-05-13 16:22:06 -07:00
Crazylemon64
5ba67e0cf1
Fixes duplicate vars
2017-05-13 16:09:44 -07:00
Fox McCloud
fc46a2c5a2
Merge pull request #7271 from Aurorablade/CultBugs
...
Fixes more cult bugs
2017-05-13 17:51:19 -04:00
FlattestGuitar
fa4f4246ed
Adds radios and prisoner IDs to prisoner lockers
2017-05-13 23:40:19 +02:00
Fox-McCloud
bbd306d60f
fix
2017-05-13 07:23:56 -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
f8a97d3e86
Merge pull request #7266 from FlattestGuitar/mark-it-down-you-shall-be-hearing-of-me-a-lot
...
Adds italics and strikethrough to OOC
2017-05-12 15:09:49 -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
Fox McCloud
5e2e5cd497
Merge pull request #7274 from Aurorablade/WeAlreadyHaveABrigPhys
...
Decreases the Brig Physician job slot back to one
2017-05-11 06:08:21 -04:00
