 Aurorablade
|
ef2fd25de6
|
Foxedits
|
2017-05-17 00:08:05 -04:00 |
|
|
Aurorablade
|
1cb0056588
|
a rather then an
|
2017-05-16 03:54:25 -04:00 |
|
|
Aurorablade
|
6a234d01c1
|
Fluffitem
|
2017-05-16 03:53:43 -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 |
|
|
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 |
|
|
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 |
|
|
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
|
63f72a29be
|
girders
|
2017-05-11 00:15:15 -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 |
|
|
Aurorablade
|
dad47b848c
|
missed one
|
2017-05-10 04:05:57 -04:00 |
|
|
Aurorablade
|
cb88a19a25
|
commit
|
2017-05-10 03:58:26 -04: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 |
|
|
Aurorablade
|
36f9727d4d
|
fixes
|
2017-05-09 03:39:53 -04:00 |
|
|
Fox McCloud
|
a890444f2f
|
Merge pull request #7247 from Aurorablade/FiftyShadesOfGrey
Fifty shades of grey
|
2017-05-09 01:07:47 -04:00 |
|
|
FlattestGuitar
|
b02c82c2d1
|
Adds basic italics and strikethrough to OOC
|
2017-05-08 21:36:27 +02:00 |
|
|
uraniummeltdown
|
a11c20ec03
|
Merge branch 'master' into rwall
# Conflicts:
# code/game/turfs/simulated/walls_reinforced.dm
|
2017-05-08 10:51:39 +04:00 |
|
|
uraniummeltdown
|
82703b9309
|
rename defines
|
2017-05-08 10:48:11 +04:00 |
|
|
Sam
|
5e6ae560d6
|
Fixing errant reference
|
2017-05-07 23:10:13 +01:00 |
|
|
Fox McCloud
|
467cb541ac
|
Merge pull request #7157 from SamHPurp/clown-abuse
Removes a disgusting hack
|
2017-05-07 17:47:59 -04:00 |
|
|
Fox McCloud
|
0f074ebaf9
|
Merge pull request #7250 from SamHPurp/Smoothes-fixed-walls
Fixes repaired r-walls not smoothing
|
2017-05-07 17:44:15 -04:00 |
|
|
GunDOSMk1
|
4ca774014a
|
Adds "Cobra Hood" hair type to unathi. (#7237)
* Added Cobra hood hair call
* Added Cobra hood Sprites
* Add files via upload
|
2017-05-07 10:23:25 -07:00 |
|
|
Fox McCloud
|
ff194f08e3
|
Guts Computer3 (#7217)
* Guts Computer3
* and the icons too
|
2017-05-07 10:22:36 -07:00 |
|
|
uraniummeltdown
|
e53bca695e
|
add more rwall repair steps, remove metal rods dropping in support_rods state
|
2017-05-07 19:19:20 +04:00 |
|
|
uraniummeltdown
|
993a5709a0
|
cleanup file
|
2017-05-07 19:00:02 +04:00 |
|