ExcessiveUseOfCobblestone
b6eddd8845
ok
2017-09-07 10:34:36 -05:00
LetterJay
ea10c4402e
Merge pull request #2443 from Citadel-Station-13/upstream-merge-30027
...
[MIRROR] Fixes hair sticking out of spess helmets
2017-09-06 09:22:44 -05:00
LetterJay
cf46abecb3
Merge pull request #2436 from Citadel-Station-13/upstream-merge-30004
...
[MIRROR] Moved emagged var to obj/item parent.
2017-09-06 09:15:11 -05:00
LetterJay
af409af9cf
additional files
2017-09-05 16:29:25 -05:00
Poojawa
5f1d88ffeb
Revert "[MIRROR] Port material containers to datum components" ( #2597 )
...
* Revert "sprite fix on kitsune tails"
This reverts commit 44d5b21a43#2591 )"
This reverts commit 7f46280d6b#2590 [ci skip]"
This reverts commit 201e07033f#2590 )"
This reverts commit 5c98b9a13b#2587 )"
This reverts commit 92e055be97#2557 [ci skip]"
This reverts commit 241a10d88d#2557 )"
This reverts commit d959b7538a#2562 )"
This reverts commit 32300086d5
2017-09-04 09:07:40 -05:00
CitadelStationBot
32300086d5
[MIRROR] Port material containers to datum components ( #2562 )
...
* Port material containers to datum components
* Fixes Rej
2017-09-04 04:08:42 -05:00
kevinz000
f45f5bbf3d
quadruple wew
2017-08-29 10:02:18 -07:00
kevinz000
ca5462adce
triple wew
2017-08-29 09:55:02 -07:00
LetterJay
6c76ae2395
clean up
2017-08-28 10:34:31 -05:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24
ok this is going to be a pain in the ass ain't it ( #2458 )
...
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00
kevinz000
6a309b5996
Revert "[MIRROR] Replace all secondary flags with bitflags stored in the flags_2 var" ( #2457 )
...
ok you know what yeah i think i'll properly mirror https://github.com/Citadel-Station-13/Citadel-Station-13/pull/2411
2017-08-22 04:04:21 -07:00
LetterJay
b01a24c95b
my eyes hurt
2017-08-22 01:42:20 -05:00
LetterJay
a0cf777040
Merge branch 'master' into upstream-merge-29940
2017-08-21 23:29:24 -05:00
CitadelStationBot
b5e7f7f7fe
[MIRROR] Adds defines for mouse_opacity ( #2381 )
...
* Adds defines for mouse_opacity
* Delete misc.dm.rej
* Update misc.dm
2017-08-21 20:29:37 -07:00
CitadelStationBot
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
LetterJay
0ffaf66d1f
Merge branch 'master' into upstream-merge-29690
2017-08-15 19:18:22 -05:00
LetterJay
6cad8ecacd
Merge pull request #2378 from Citadel-Station-13/upstream-merge-29384
...
[MIRROR] Deathsquads no longer get shielded hardsuits
2017-08-15 10:14:35 -05:00
CitadelStationBot
313ba00dd5
Deathsquads no longer get shielded hardsuits
2017-08-15 09:59:51 -05:00
CitadelStationBot
402b9a6cab
Fixes mining hardsuit heat_protection
2017-08-15 05:55:57 -05:00
LetterJay
77025ae8a2
Merge branch 'master' into upstream-merge-29651
2017-08-14 19:37:09 -05:00
LetterJay
9b57f5fd62
Update collectable.dm
2017-08-14 18:39:22 -05:00
LetterJay
46c6a54a75
Update misc.dm
2017-08-14 18:38:55 -05:00
CitadelStationBot
bd35823012
[ready]Makes bIcon better
2017-08-13 17:41:12 -05:00
LetterJay
05cbf7927a
Merge pull request #2311 from Citadel-Station-13/upstream-merge-29775
...
[MIRROR] Fixes repairing jumpsuits.
2017-08-09 02:22:17 -05:00
CitadelStationBot
0a7a8fcf90
Fixes repairing jumpsuits.
2017-08-08 15:04:21 -05:00
CitadelStationBot
cdbaf5c4e8
Standardized CENTCOM spelling
2017-08-08 09:05:44 -05:00
CitadelStationBot
42fc6497d4
Fixes hair sticking through hats.
2017-08-06 03:13:11 -05:00
CitadelStationBot
5cad493494
Fixes unintended corgi equips. ( #2245 )
2017-08-04 08:42:41 -07:00
CitadelStationBot
1b22c5fe0c
[MIRROR] Separates actions.dmi into multiple files ( #2214 )
...
* Separates actions.dmi into multiple files
* Delete beam_rifle.dm.rej
* Delete action.dm.rej
2017-08-03 06:09:39 -07:00
CitadelStationBot
dd22c79678
Completes major inhand split project ( #2178 )
2017-08-02 06:30:33 -05:00
CitadelStationBot
8a4ddbe8a8
[MIRROR] Ports Rapid Cable Layers from /vg/ and paradise ( #2162 )
...
* Ports Rapid Cable Layers from /vg/ and paradise
* rej clean up + manual sync
* maps and .rej file cleanup
* sprite and WGW memes
* actual spellchecked memes
* some other map fix memes
* fuck it, let's just hard sync maps
* dumb paperwork shit for maps
* Revert "dumb paperwork shit for maps"
This reverts commit 8e70bbec0f407c334cd81f5b92aafdb90544ca9d.
* *autistic screeching*
* REEEEEEEEEEEEEEEEEEEEE
* Fuck off I want to do something else
2017-08-02 04:56:44 -05:00
CitadelStationBot
55f1de10a6
Spellchecking
2017-08-01 08:46:20 -05:00
kevinz000
bbcad2fa58
Proper mirror PR for the disease refactor because I fucked up the first one. ( #2026 )
...
* Revert "im a dumbass and didn't see the .rej files Revert "[MIRROR] Disease Refactor" (#2025 )"
This reverts commit 44742cb115
2017-07-31 23:41:22 -07:00
LetterJay
35fba1933e
Merge pull request #2063 from Citadel-Station-13/upstream-merge-29304
...
[MIRROR] Made some object lists less terrible to read
2017-07-31 03:43:03 -05:00
LetterJay
79bf3edab9
Update syndi.dm
2017-07-31 02:14:50 -05:00
LetterJay
4f324214c5
Update plasmamen.dm
2017-07-31 02:14:15 -05:00
LetterJay
0bba1ec9b6
Update miscellaneous.dm
2017-07-31 02:13:42 -05:00
LetterJay
fe37d52cc5
Update hardsuit.dm
2017-07-31 02:12:22 -05:00
LetterJay
bdcc4bc429
Update miscellaneous.dm
2017-07-30 23:33:58 -05:00
LetterJay
4c0c11524b
Update syndi.dm
2017-07-30 23:32:50 -05:00
LetterJay
a99fa2ea49
Update plasmamen.dm
2017-07-30 23:31:33 -05:00
LetterJay
e3dfc8b61d
Update miscellaneous.dm
2017-07-30 23:30:51 -05:00
LetterJay
85885330ba
Update hardsuit.dm
2017-07-30 23:29:36 -05:00
CitadelStationBot
64b721ae4f
Halloween Costumes ( #2169 )
2017-07-28 23:51:11 -07:00
CitadelStationBot
e937aeaa51
Fixes harmonicas acting like muzzles (and runtiming instead of properly muting you too.)
2017-07-21 18:26:06 -05:00
LetterJay
27b826a6f1
Merge pull request #2033 from Citadel-Station-13/upstream-merge-29260
...
[MIRROR] Changes all access const to be a define
2017-07-19 13:18:58 -05:00
CitadelStationBot
a72962c300
Made some object lists less terrible to read
2017-07-18 09:44:43 -05:00
CitadelStationBot
bbc28aa856
Energy swords and other transforming energy weapons are now subtypes of transforming weapons ( #2049 )
2017-07-17 22:51:51 -07:00
CitadelStationBot
b2c8115ca5
Winter coats now properly hold flashlights ( #2043 )
2017-07-17 22:51:14 -07:00
