CitadelStationBot
4c4bd22578
[MIRROR] Some more tweaks to Geis ( #2487 )
...
fixes clockcult conversion being :b:roken, as well as some geis tweaks that you won't care about
2017-08-27 01:36:17 -07:00
kevinz000
3254fcf535
goddamnit_again ( #2511 )
2017-08-26 18:43:57 -07:00
kevinz000
c638386507
Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. ( #2460 )
...
* fuck pubby
* fuck you too ceres
* ree
* this is going to be a disaster isn't it
* disaster
* dme
* -_-
* tg
* woops
* proper sync
* Welcome to conflict hell.
* lets hope this fixes more things than it breaks
* gdi
* goddamnit
2017-08-24 21:07:58 -07:00
LetterJay
188193eb61
here we go again ( #2456 )
2017-08-24 19:24:25 -07:00
CitadelStationBot
3ea2288820
Fixes sounds for toy nuke, red button, and talking action figures ( #2475 )
2017-08-24 18:31:24 -07:00
CitadelStationBot
43cad07181
Transit tube pods no longer constantly suck in air ( #2478 )
2017-08-24 18:30:12 -07:00
CitadelStationBot
a6d64204ad
[MIRROR] Updates PubbyStation ( #2325 )
...
no
2017-08-22 18:20:46 -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
4961966552
|SPECIES FOOD PREFERENCES| ( #2232 )
...
* Species food preferences
* sync
* Update humans.dm
* FUCK PUBBY
2017-08-21 20:23:30 -07:00
LetterJay
f2f1474123
Merge pull request #2322 from Citadel-Station-13/upstream-merge-29747
...
[MIRROR] Removes a great amount of machinery copypasta with circuitboards.
2017-08-21 20:32:10 -05:00
LetterJay
83f4733027
Rename _circuitboard.dm to circuitboard.dm
2017-08-21 20:01:59 -05:00
CitadelStationBot
772299445e
Makes the Ark of the Clockwork Justicar much more fancy
2017-08-20 19:55:15 -05:00
LetterJay
ae9e4495f9
Merge branch 'master' into upstream-merge-29747
2017-08-20 09:53:17 -05:00
LetterJay
19b8a5a380
Merge pull request #2352 from Citadel-Station-13/upstream-merge-29858
...
[MIRROR] Fixed sign description
2017-08-18 13:41:07 -05:00
LetterJay
db3622ca12
Update signs.dm
2017-08-18 11:18:33 -05:00
CitadelStationBot
87b3df3069
Replace all secondary flags with bitflags stored in the flags_2 var
2017-08-17 09:19:14 -05:00
CitadelStationBot
72cf7083f6
Fixes leathercrafting recipies trying to build on the floor.
2017-08-17 09:19:09 -05:00
CitadelStationBot
c2d335b7da
[s] Fixes MG turret firing while the user is stunned/cuffed/unconscious
2017-08-16 17:50:28 -05:00
LetterJay
0ffaf66d1f
Merge branch 'master' into upstream-merge-29690
2017-08-15 19:18:22 -05:00
LetterJay
ab27b63cf9
Merge branch 'master' into upstream-merge-29611
2017-08-15 18:55:12 -05:00
CitadelStationBot
3d83b55cf6
Annihilates the colons!
2017-08-15 10:49:55 -05:00
LetterJay
e5cd79a14e
Merge pull request #2373 from Citadel-Station-13/upstream-merge-29854
...
[MIRROR] Moved can_trigger_gun to item/weapon parent
2017-08-14 18:53:38 -05:00
LetterJay
6d62d51eab
Merge pull request #2198 from Citadel-Station-13/upstream-merge-29288
...
[MIRROR] Hallucinations 3.0
2017-08-14 18:45:45 -05:00
LetterJay
300fc768a5
Merge pull request #2265 from Citadel-Station-13/upstream-merge-29727
...
[MIRROR] The inhands of the Dark Blessing chaplain weapon is now visible.
2017-08-14 18:37:28 -05:00
LetterJay
1bb5e19596
Merge pull request #2255 from Citadel-Station-13/upstream-merge-29695
...
[MIRROR] flora.dm initialize hint
2017-08-14 18:36:58 -05:00
LetterJay
69bf7e42cf
Merge branch 'master' into upstream-merge-29288
2017-08-14 18:35:28 -05:00
CitadelStationBot
97243fca3a
Moved can_trigger_gun to item/weapon parent
2017-08-14 16:05:43 -05:00
LetterJay
f088e812a9
Update flora.dm
2017-08-14 09:31:49 -05:00
CitadelStationBot
bd35823012
[ready]Makes bIcon better
2017-08-13 17:41:12 -05:00
LetterJay
64da23febb
Merge pull request #2356 from Citadel-Station-13/upstream-merge-29840
...
[MIRROR] Adds icon_states to the unused and used Eldritch whetstones
2017-08-13 09:53:11 -05:00
CitadelStationBot
1e3ea07d8b
Adds icon_states to the unused and used Eldritch whetstones
2017-08-13 01:28:24 -05:00
CitadelStationBot
7004797c8c
Fixed sign description
2017-08-13 01:28:08 -05:00
CitadelStationBot
80f1fb8c58
Fix fireaxe cabinets spawned with broken icons
2017-08-13 01:28:03 -05:00
LetterJay
a9a7807473
Merge pull request #2339 from Citadel-Station-13/upstream-merge-29819
...
[MIRROR] His Grace now shows up on the orbit list
2017-08-12 06:36:57 -05:00
LetterJay
dd6c9d6a04
Merge pull request #2334 from Citadel-Station-13/upstream-merge-29811
...
[MIRROR] Fixes cable cuff inhand
2017-08-12 06:36:15 -05:00
LetterJay
122727059b
Merge pull request #2333 from Citadel-Station-13/upstream-merge-29804
...
[MIRROR] Ports weaponry to Initialize
2017-08-12 06:35:25 -05:00
LetterJay
c174eb3f5d
Merge pull request #2331 from Citadel-Station-13/upstream-merge-29803
...
[MIRROR] Ports weapons to Initialize()
2017-08-12 06:35:09 -05:00
LetterJay
6b6e5d0018
Merge pull request #2326 from Citadel-Station-13/upstream-merge-29805
...
[MIRROR] decapitalizes flyswatter in weaponry.dm
2017-08-12 06:34:28 -05:00
CitadelStationBot
582a106d8e
His Grace now shows up on the orbit list
2017-08-11 15:09:24 -05:00
CitadelStationBot
84076d7bb9
intialize() supermatter sword ( #2332 )
2017-08-11 12:29:51 -07:00
CitadelStationBot
6c6d8e5193
Fixes cable cuff inhand
2017-08-11 02:52:25 -05:00
CitadelStationBot
dab46b002c
Ports weaponry to Initialize
2017-08-11 02:50:20 -05:00
CitadelStationBot
fa19568a06
Ports weapons to Initialize()
2017-08-11 02:49:11 -05:00
CitadelStationBot
f6da0f89c3
decapitalizes flyswatter in weaponry.dm
2017-08-10 08:09:25 -05:00
CitadelStationBot
4d19a89519
Removes a great amount of machinery copypasta with circuitboards.
2017-08-09 19:24:19 -05:00
LetterJay
26ca12fb04
Merge pull request #2310 from Citadel-Station-13/upstream-merge-29773
...
[MIRROR] Fix RCL loading
2017-08-09 02:22:09 -05:00
